File tree Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -16,13 +16,12 @@ inputs:
16
16
required : false
17
17
marker :
18
18
description : Marker to use
19
- default : " "
20
19
required : false
21
20
22
21
outputs :
23
22
test-results-name :
24
23
description : Test results name
25
- value : tests-nginx- ${{ inputs.image }}-${{ inputs.marker }}
24
+ value : tests-${{ steps.k8s.outputs.cluster }}
26
25
27
26
runs :
28
27
using : composite
66
65
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 }}
67
66
kind load docker-image docker.io/nginx/nginx-ingress:${{ inputs.image }}-${{ github.sha }} --name ${{ github.run_id }}
68
67
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 }})
70
69
shell : bash
71
70
72
71
- name : Setup Kubeconfig
90
89
--html=tests-${{ steps.k8s.outputs.cluster }}.html \
91
90
--self-contained-html \
92
91
--show-ic-logs=yes --profile \
93
- -m ${{ inputs.marker }}
92
+ -m ${{ inputs.marker != '' && inputs.marker || '""' }}
94
93
working-directory : ./tests
95
94
shell : bash
Original file line number Diff line number Diff line change @@ -145,7 +145,7 @@ jobs:
145
145
uses : ./.github/actions/smoke-tests
146
146
with :
147
147
image : ${{ matrix.images.image != '' && matrix.images.image || 'debian' }}
148
- marker : ${{ matrix.images.marker != '' && matrix.images.marker || '"" ' }}
148
+ marker : ${{ matrix.images.marker != '' && matrix.images.marker || '' }}
149
149
k8s-version : ${{ matrix.k8s != '' && matrix.k8s || env.K8S_VERSION }}
150
150
- name : Upload Test Results
151
151
uses : actions/upload-artifact@v2
You can’t perform that action at this time.
0 commit comments