Skip to content

Commit f2b2443

Browse files
authored
Fix tests upload in the workflow (#2038)
1 parent 24d8f9a commit f2b2443

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/actions/smoke-tests/action.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ inputs:
1616
required: false
1717
marker:
1818
description: Marker to use
19-
default: ""
2019
required: false
2120

2221
outputs:
2322
test-results-name:
2423
description: Test results name
25-
value: tests-nginx-${{ inputs.image }}-${{ inputs.marker }}
24+
value: tests-${{ steps.k8s.outputs.cluster }}
2625

2726
runs:
2827
using: composite
@@ -66,7 +65,7 @@ runs:
6665
kind create cluster --name ${{ github.run_id }} --image=kindest/node:v${{ inputs.k8s-version }} --config ${{ github.workspace }}/tests/ci-files/ci-kind-config.yaml --kubeconfig kube-${{ github.run_id }} --wait ${{ inputs.k8s-timeout }}
6766
kind load docker-image docker.io/nginx/nginx-ingress:${{ inputs.image }}-${{ github.sha }} --name ${{ github.run_id }}
6867
echo ::set-output name=cluster_ip::$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${{ github.run_id }}-control-plane)
69-
echo ::set-output name=cluster::$(echo 'nginx-${{ inputs.image }}-${{ inputs.marker != '""' && inputs.marker || inputs.k8s-version }}')
68+
echo ::set-output name=cluster::$(echo nginx-${{ inputs.image }}-${{ inputs.marker != '' && inputs.marker || inputs.k8s-version }})
7069
shell: bash
7170

7271
- name: Setup Kubeconfig
@@ -90,6 +89,6 @@ runs:
9089
--html=tests-${{ steps.k8s.outputs.cluster }}.html \
9190
--self-contained-html \
9291
--show-ic-logs=yes --profile \
93-
-m ${{ inputs.marker }}
92+
-m ${{ inputs.marker != '' && inputs.marker || '""' }}
9493
working-directory: ./tests
9594
shell: bash

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
uses: ./.github/actions/smoke-tests
146146
with:
147147
image: ${{ matrix.images.image != '' && matrix.images.image || 'debian' }}
148-
marker: ${{ matrix.images.marker != '' && matrix.images.marker || '""' }}
148+
marker: ${{ matrix.images.marker != '' && matrix.images.marker || '' }}
149149
k8s-version: ${{ matrix.k8s != '' && matrix.k8s || env.K8S_VERSION }}
150150
- name: Upload Test Results
151151
uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)