Skip to content

Commit e26c82a

Browse files
authored
Fix conformance profile upload (#2932)
1 parent 6ab4a5d commit e26c82a

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

.github/workflows/conformance.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ defaults:
1919

2020
env:
2121
PLUS_USAGE_ENDPOINT: ${{ secrets.JWT_PLUS_REPORTING_ENDPOINT }}
22+
ENABLE_EXPERIMENTAL: ${{ inputs.enable-experimental }}
2223

2324
permissions:
2425
contents: read
@@ -79,7 +80,6 @@ jobs:
7980
run: |
8081
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
8182
ngf_tag=${{ steps.ngf-meta.outputs.version }}
82-
if [ ${{ inputs.enable-experimental }} == "true" ]; then export ENABLE_EXPERIMENTAL=true; fi
8383
make generate-static-deployment PLUS_ENABLED=${{ inputs.image == 'plus' && 'true' || 'false' }} PREFIX=${ngf_prefix} TAG=${ngf_tag}
8484
working-directory: ./tests
8585

@@ -150,22 +150,27 @@ jobs:
150150
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
151151
ngf_tag=${{ steps.ngf-meta.outputs.version }}
152152
if [ ${{ github.event_name }} == "schedule" ]; then export GW_API_VERSION=main; fi
153-
if [ ${{ inputs.enable-experimental }} == "true" ]; then export ENABLE_EXPERIMENTAL=true; fi
154153
make helm-install-local${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
155154
make deploy-updated-provisioner PREFIX=${ngf_prefix} TAG=${ngf_tag}
156155
working-directory: ./tests
157156

158157
- name: Run conformance tests
159158
run: |
160-
if [ ${{ inputs.enable-experimental }} == "true" ]; then export ENABLE_EXPERIMENTAL=true; fi
161159
make run-conformance-tests CONFORMANCE_TAG=${{ github.sha }} NGF_VERSION=${{ github.ref_name }} CLUSTER_NAME=${{ github.run_id }}
162160
core_result=$(cat conformance-profile.yaml | yq '.profiles[0].core.result')
163161
extended_result=$(cat conformance-profile.yaml | yq '.profiles[0].extended.result')
164162
if [ "${core_result}" == "failure" ] || [ "${extended_result}" == "failure" ]; then echo "Conformance test failed, see above for details." && exit 2; fi
165163
working-directory: ./tests
166164

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

0 commit comments

Comments
 (0)