From 022f00d9619ebd2d4251427af8600708bfe2024f Mon Sep 17 00:00:00 2001
From: Paul Abel <p.abel@f5.com>
Date: Tue, 26 Mar 2024 12:54:06 +0000
Subject: [PATCH] ensure docker is setup to build

---
 .github/actions/smoke-tests/action.yaml | 2 +-
 .github/workflows/ci.yml                | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/actions/smoke-tests/action.yaml b/.github/actions/smoke-tests/action.yaml
index b76979b3e2..5fbbc7f0e3 100644
--- a/.github/actions/smoke-tests/action.yaml
+++ b/.github/actions/smoke-tests/action.yaml
@@ -66,7 +66,7 @@ runs:
         --context=kind-${{ github.run_id }} \
         --image=${{ inputs.image-name }}:${{ inputs.tag }} \
         --image-pull-policy=Never \
-        --ic-type=${{ inputs.image-name }} \
+        --ic-type=nginx${{ contains(inputs.image-name, 'plus') && '-plus' || '' }}-ingress \
         --service=nodeport --node-ip=${{ steps.k8s.outputs.cluster_ip }} \
         --html=tests-${{ steps.k8s.outputs.cluster }}.html \
         --self-contained-html \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f408bbbedf..5ffb5e0589 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -491,13 +491,11 @@ jobs:
 
       - name: Docker Buildx
         uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
-        if: ${{ needs.checks.outputs.forked_workflow == 'true' || steps.base_exists.outputs.exists != 0 }}
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
         with:
           platforms: ${{ matrix.platforms }}
-        if: ${{ needs.checks.outputs.forked_workflow == 'true' || steps.base_exists.outputs.exists != 0 }}
 
       - name: Build Base Container
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0