ci: refactor k8s-kind wait for image step

Using the wait-for-image action
Also moving from /default to /test in ariane config so we don't
have timeout because they'll be triggered once image build is done

Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>

Author: Artyop

.github/ariane-config.yaml

@@ -10,9 +10,7 @@ triggers:
     - tests-cifuzz.yaml
     - lint-ariane-config.yaml
     - conformance-kubespray.yaml
-    - k8s-kind-network-e2e.yaml
     - lint-images-base.yaml
-    - k8s-kind-network-policies-e2e.yaml
   # This trigger needs to be kept in sync with ariane-scheduled.yaml workflow
   /test\s*:
     workflows:
@@ -38,6 +36,8 @@ triggers:
     - tests-clustermesh-upgrade.yaml
     - tests-datapath-verifier.yaml
     - hubble-cli-integration-test.yaml
+    - k8s-kind-network-e2e.yaml
+    - k8s-kind-network-policies-e2e.yaml
     depends-on:
     - /build-images-dependency
   /ci-aks:

.github/workflows/conformance-k8s-network-policies.yaml

@@ -86,6 +86,7 @@ jobs:
           login-host: ${{ vars.DOCKER_READ_HOST }}
           login-username: ${{ vars.DOCKER_READ_USERNAME }}
           login-password: ${{ secrets.DOCKER_READ_PASSWORD }}
+          auth-required: ${{ vars.DOCKER_AUTH_REQUIRED }}
 
       - name: Create kind cluster
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0

.github/workflows/k8s-kind-network-e2e.yaml

@@ -202,21 +202,16 @@ jobs:
             --docker-username="${{ vars.DOCKER_READ_USERNAME }}" \
             --docker-password="${{ secrets.DOCKER_READ_PASSWORD }}"
 
-      - name: Login to docker registry for image wait
-        if: ${{ vars.DOCKER_AUTH_REQUIRED == 'true' }}
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
-        with:
-          registry: ${{ vars.DOCKER_READ_HOST}}
-          username: ${{ vars.DOCKER_READ_USERNAME}}
-          password: ${{ secrets.DOCKER_READ_PASSWORD }}
-
       - name: Wait for images to be available
         timeout-minutes: 30
-        shell: bash
-        run: |
-          for image in cilium-ci operator-generic-ci hubble-relay-ci ; do
-            until docker manifest inspect ${{ vars.DOCKER_READ_HOST }}/${{ vars.DOCKER_READ_ORG }}/$image:${{ steps.vars.outputs.sha }} &> /dev/null; do sleep 45s; done
-          done
+        uses: ./.github/actions/wait-for-images
+        with:
+          SHA: ${{ steps.vars.outputs.sha }}
+          images: cilium-ci operator-generic-ci hubble-relay-ci
+          login-host: ${{ vars.DOCKER_READ_HOST }}
+          login-username: ${{ vars.DOCKER_READ_USERNAME }}
+          login-password: ${{ secrets.DOCKER_READ_PASSWORD }}
+          auth-required: ${{ vars.DOCKER_AUTH_REQUIRED }}
 
       # Warning: since this is a privileged workflow, subsequent workflow job
       # steps must take care not to execute untrusted code.

.github/workflows/k8s-kind-network-policies-e2e.yaml

@@ -213,21 +213,16 @@ jobs:
             --docker-username="${{ vars.DOCKER_READ_USERNAME }}" \
             --docker-password="${{ secrets.DOCKER_READ_PASSWORD }}"
 
-      - name: Login to docker registry for image wait
-        if: ${{ vars.DOCKER_AUTH_REQUIRED == 'true' }}
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
-        with:
-          registry: ${{ vars.DOCKER_READ_HOST}}
-          username: ${{ vars.DOCKER_READ_USERNAME}}
-          password: ${{ secrets.DOCKER_READ_PASSWORD }}
-
       - name: Wait for images to be available
         timeout-minutes: 30
-        shell: bash
-        run: |
-          for image in cilium-ci operator-generic-ci hubble-relay-ci ; do
-            until docker manifest inspect ${{ vars.DOCKER_READ_HOST }}/${{ vars.DOCKER_READ_ORG }}/$image:${{ steps.vars.outputs.sha }} &> /dev/null; do sleep 45s; done
-          done
+        uses: ./.github/actions/wait-for-images
+        with:
+          SHA: ${{ steps.vars.outputs.sha }}
+          images: cilium-ci operator-generic-ci hubble-relay-ci
+          login-host: ${{ vars.DOCKER_READ_HOST }}
+          login-username: ${{ vars.DOCKER_READ_USERNAME }}
+          login-password: ${{ secrets.DOCKER_READ_PASSWORD }}
+          auth-required: ${{ vars.DOCKER_AUTH_REQUIRED }}
 
       # Warning: since this is a privileged workflow, subsequent workflow job
       # steps must take care not to execute untrusted code.