Skip to content

Commit 9311828

Browse files
committed
Fix conformance profile upload
1 parent 6d8b38a commit 9311828

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

.github/workflows/conformance.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ defaults:
1717
run:
1818
shell: bash
1919

20+
env:
21+
ENABLE_EXPERIMENTAL: ${{ inputs.enable-experimental }}
22+
2023
permissions:
2124
contents: read
2225

@@ -76,7 +79,6 @@ jobs:
7679
run: |
7780
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
7881
ngf_tag=${{ steps.ngf-meta.outputs.version }}
79-
if [ ${{ inputs.enable-experimental }} == "true" ]; then export ENABLE_EXPERIMENTAL=true; fi
8082
export PLUS_USAGE_ENDPOINT=${{ secrets.JWT_PLUS_REPORTING_ENDPOINT }}
8183
make generate-static-deployment PLUS_ENABLED=${{ inputs.image == 'plus' && 'true' || 'false' }} PREFIX=${ngf_prefix} TAG=${ngf_tag}
8284
working-directory: ./tests
@@ -148,23 +150,28 @@ jobs:
148150
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
149151
ngf_tag=${{ steps.ngf-meta.outputs.version }}
150152
if [ ${{ github.event_name }} == "schedule" ]; then export GW_API_VERSION=main; fi
151-
if [ ${{ inputs.enable-experimental }} == "true" ]; then export ENABLE_EXPERIMENTAL=true; fi
152153
export PLUS_USAGE_ENDPOINT=${{ secrets.JWT_PLUS_REPORTING_ENDPOINT }}
153154
make helm-install-local${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
154155
make deploy-updated-provisioner PREFIX=${ngf_prefix} TAG=${ngf_tag}
155156
working-directory: ./tests
156157

157158
- name: Run conformance tests
158159
run: |
159-
if [ ${{ inputs.enable-experimental }} == "true" ]; then export ENABLE_EXPERIMENTAL=true; fi
160160
make run-conformance-tests CONFORMANCE_TAG=${{ github.sha }} NGF_VERSION=${{ github.ref_name }} CLUSTER_NAME=${{ github.run_id }}
161161
core_result=$(cat conformance-profile.yaml | yq '.profiles[0].core.result')
162162
extended_result=$(cat conformance-profile.yaml | yq '.profiles[0].extended.result')
163163
if [ "${core_result}" == "failure" ] || [ "${extended_result}" == "failure" ]; then echo "Conformance test failed, see above for details." && exit 2; fi
164164
working-directory: ./tests
165165

166+
- name: Upload profile to GitHub
167+
if: ${{ inputs.enable-experimental }}
168+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
169+
with:
170+
name: conformance-profile-${{ inputs.image }}-${{ inputs.k8s-version }}
171+
path: ./tests/conformance-profile.yaml
172+
166173
- name: Upload profile to release
167-
if: ${{ startsWith(github.ref, 'refs/tags/') && inputs.enable-experimental == 'true' }}
174+
if: ${{ startsWith(github.ref, 'refs/tags/') && inputs.enable-experimental }}
168175
env:
169176
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170177
run: gh release upload ${{ github.ref_name }} conformance-profile.yaml --clobber

0 commit comments

Comments
 (0)