plus

nginxinc · Nov 18, 2021 · 69c90b2 · 69c90b2
1 parent d3af16f
commit 69c90b2
Showing 1 changed file with 13 additions and 3 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: Check plus
+      id: plus
+      run: |
+        plus=""
+        if [[ ${{ inputs.image }} == *plus* ]]; then
+          plus="-plus"
+        fi
+        echo ::set-output name=plus::$plus
+      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/nginx${{ steps.plus.outputs.plus }}-ingress:${{ inputs.image }}-${{ github.sha }}'
         load: true
         pull: true
         build-args: BUILD_OS=${{ inputs.image }}
@@ -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/nginx${{ steps.plus.outputs.plus }}-ingress:${{ inputs.image }}-${{ github.sha }} \
         --image-pull-policy=Never \
-        --ic-type=nginx-ingress \
+        --ic-type=nginx${{ steps.plus.outputs.plus }}-ingress \
         --service=nodeport --node-ip=${{ steps.k8s.outputs.cluster_ip }} \
         --html=tests-${{ steps.k8s.outputs.cluster }}.html \
         --self-contained-html \