plus

nginxinc · Nov 18, 2021 · d81d4d6 · d81d4d6
1 parent e59a687
commit d81d4d6
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/.github/actions/smoke-tests/action.yaml b/.github/actions/smoke-tests/action.yaml
@@ -38,6 +38,16 @@ runs:
         path: ${{ github.workspace }}/dist
         key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}-single
 
+    - name: Ingress type
+      id: ingress-type
+      run: |
+        plus=""
+        if [[ ${{ inputs.image }} == *plus* ]]; then
+          plus="-plus"
+        fi
+        echo ::set-output name=name::nginx$plus-ingress
+      shell: bash
+
     - name: Docker Buildx
       uses: docker/setup-buildx-action@v1
 
@@ -49,7 +59,7 @@ runs:
         cache-from: type=gha,scope=${{ inputs.image }}
         cache-to: type=gha,scope=${{ inputs.image }},mode=max
         target: goreleaser
-        tags: 'docker.io/nginx/nginx-ingress:${{ inputs.image }}-${{ github.sha }}'
+        tags: 'docker.io/nginx/${{ steps.ingress-type.outputs.name }}:${{ inputs.image }}-${{ github.sha }}'
         load: true
         pull: true
         build-args: BUILD_OS=${{ inputs.image }}
@@ -72,7 +82,7 @@ runs:
       id: k8s
       run: |
         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 }}
-        kind load docker-image docker.io/nginx/nginx-ingress:${{ inputs.image }}-${{ github.sha }} --name ${{ github.run_id }}
+        kind load docker-image docker.io/nginx/${{ steps.ingress-type.outputs.name }}:${{ inputs.image }}-${{ github.sha }} --name ${{ github.run_id }}
         echo ::set-output name=cluster_ip::$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${{ github.run_id }}-control-plane)
         echo ::set-output name=cluster::$(echo nginx-${{ inputs.image }}-${{ inputs.marker != '' && inputs.marker || inputs.k8s-version }})
       shell: bash
@@ -91,9 +101,9 @@ runs:
         -v ${{ github.workspace }}/tests/tests-${{ steps.k8s.outputs.cluster }}.html:/workspace/tests/tests-${{ steps.k8s.outputs.cluster }}.html \
         -v ${{ github.workspace }}/kube-${{ github.run_id }}:/root/.kube/config test-runner:${{ github.sha }} \
         --context=kind-${{ github.run_id }} \
-        --image=docker.io/nginx/nginx-ingress:${{ inputs.image }}-${{ github.sha }} \
+        --image=docker.io/nginx/${{ steps.ingress-type.outputs.name }}:${{ inputs.image }}-${{ github.sha }} \
         --image-pull-policy=Never \
-        --ic-type=nginx-ingress \
+        --ic-type=${{ steps.ingress-type.outputs.name }} \
         --service=nodeport --node-ip=${{ steps.k8s.outputs.cluster_ip }} \
         --html=tests-${{ steps.k8s.outputs.cluster }}.html \
         --self-contained-html \