Skip to content

Commit 2f58cf8

Browse files
committed
chore(ci): fix e2e's artifact name
1 parent d9241d8 commit 2f58cf8

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

.github/workflows/_e2e_tests.yaml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,16 @@ jobs:
182182
KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
183183
GOTESTSUM_JUNITFILE: ${{ env.GOTESTSUM_JUNITFILE }}
184184

185-
- run: |
185+
- name: Set KONG_IMAGE_ARTIFACT
186+
run: |
187+
if: ${{ always() }}
186188
if [ "${{ steps.split.outputs.kong-image }}" != "" ]; then
187-
echo "KONG_IMAGE_ARTIFACT=kongimage-$( echo ${{ steps.split.outputs.kong-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kong-tag }}" >> $GITHUB_ENV
189+
export kong_image=$( echo ${{ steps.split.outputs.kong-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kong-tag }}
190+
fi
191+
if [ "${{ steps.split.outputs.kic-image }}" != "" ]; then
192+
export kic_image=$( echo ${{ steps.split.outputs.kic-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kic-tag }}
188193
fi
194+
echo "KONG_IMAGE_ARTIFACT=kong_image-${kong_image}-kic_image-${kic_image}" >> $GITHUB_ENV
189195

190196
- name: upload diagnostics
191197
if: ${{ always() }}
@@ -291,10 +297,16 @@ jobs:
291297
GOOGLE_LOCATION: ${{ secrets.GOOGLE_LOCATION }}
292298
TEST_GKE_CLUSTER_RELEASE_CHANNEL: "rapid"
293299

294-
- run: |
300+
- name: Set KONG_IMAGE_ARTIFACT
301+
run: |
302+
if: ${{ always() }}
295303
if [ "${{ steps.split.outputs.kong-image }}" != "" ]; then
296-
echo "KONG_IMAGE_ARTIFACT=kongimage-$( echo ${{ steps.split.outputs.kong-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kong-tag }}" >> $GITHUB_ENV
304+
export kong_image=$( echo ${{ steps.split.outputs.kong-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kong-tag }}
297305
fi
306+
if [ "${{ steps.split.outputs.kic-image }}" != "" ]; then
307+
export kic_image=$( echo ${{ steps.split.outputs.kic-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kic-tag }}
308+
fi
309+
echo "KONG_IMAGE_ARTIFACT=kong_image-${kong_image}-kic_image-${kic_image}" >> $GITHUB_ENV
298310

299311
- name: upload diagnostics
300312
if: ${{ always() }}
@@ -394,10 +406,16 @@ jobs:
394406
# multiple kind clusters within a single job, so only 1 is allowed at a time.
395407
GOTESTSUM_JUNITFILE: ${{ env.GOTESTSUM_JUNITFILE }}
396408

397-
- run: |
409+
- name: Set KONG_IMAGE_ARTIFACT
410+
run: |
411+
if: ${{ always() }}
398412
if [ "${{ steps.split.outputs.kong-image }}" != "" ]; then
399-
echo "KONG_IMAGE_ARTIFACT=kongimage-$( echo ${{ steps.split.outputs.kong-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kong-tag }}" >> $GITHUB_ENV
413+
export kong_image=$( echo ${{ steps.split.outputs.kong-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kong-tag }}
414+
fi
415+
if [ "${{ steps.split.outputs.kic-image }}" != "" ]; then
416+
export kic_image=$( echo ${{ steps.split.outputs.kic-image }} | awk '{gsub(/[:.\/]/, "-")};$1' )-${{ steps.split.outputs.kic-tag }}
400417
fi
418+
echo "KONG_IMAGE_ARTIFACT=kong_image-${kong_image}-kic_image-${kic_image}" >> $GITHUB_ENV
401419

402420
- name: upload diagnostics
403421
if: ${{ always() }}

0 commit comments

Comments
 (0)