From b4874424239e9fbefed89dcdb6545933f9348155 Mon Sep 17 00:00:00 2001
From: stevenhorsman <steven@uk.ibm.com>
Date: Mon, 22 Apr 2024 16:36:49 +0100
Subject: [PATCH] workflows: e2e workflow - update the CAA image setup

- In preparation for the switch to use the latest operator we need to
add code that will pass the CAA Image in to the e2e test properties file
and try and work with both the new and old operator so that
the workflow tests can pass pulled from main
- In a future PR we will remove the old kustomize versions

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
---
 .github/workflows/e2e_libvirt.yaml | 7 +++++++
 .github/workflows/e2e_run_all.yaml | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e_libvirt.yaml b/.github/workflows/e2e_libvirt.yaml
index 6085f9633..35556b2a0 100644
--- a/.github/workflows/e2e_libvirt.yaml
+++ b/.github/workflows/e2e_libvirt.yaml
@@ -10,6 +10,9 @@ on:
       podvm_image:
         required: true
         type: string
+      caa_image:
+        required: true
+        type: string
       install_directory_artifact:
         description: The archive name of the install directory
         default: ''
@@ -79,6 +82,7 @@ jobs:
       - name: Config Libvirt
         run: |
           ./libvirt/config_libvirt.sh
+          echo "CAA_IMAGE=\"${{ inputs.caa_image }}\"" >> libvirt.properties
           # For debugging
           cat libvirt.properties
 
@@ -106,6 +110,9 @@ jobs:
           echo "::group::cloud-api-adaptor logs"
           kubectl logs -l app=cloud-api-adaptor -n confidential-containers-system
           echo "::endgroup::"
+          echo "::group::peerpodconfig-ctrl-caa-daemon logs"
+          kubectl logs ds/peerpodconfig-ctrl-caa-daemon -n confidential-containers-system
+          echo "::endgroup::"
 
           for pod in $(kubectl get pods -o name 2>/dev/null); do
             echo "::group::Describe $pod"
diff --git a/.github/workflows/e2e_run_all.yaml b/.github/workflows/e2e_run_all.yaml
index db37b2216..39f927e08 100644
--- a/.github/workflows/e2e_run_all.yaml
+++ b/.github/workflows/e2e_run_all.yaml
@@ -125,7 +125,6 @@ jobs:
           providers=(${{ env.PROVIDERS }})
           # If there aren't providers then something is wrong
           [[ ${#providers[@]} -gt 0 ]] || exit 1
-
           for provider in ${providers[@]}; do
             img="${E2E_IMG_REGISTRY}/cloud-api-adaptor"
             tag="${E2E_IMG_RELEASE_TAG}"
@@ -142,7 +141,8 @@ jobs:
             popd
           done
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload install directory for next test runs
+        uses: actions/upload-artifact@v3
         with:
           name: install_directory
           path: src/cloud-api-adaptor/install/
@@ -167,6 +167,7 @@ jobs:
           - amd64
     uses: ./.github/workflows/e2e_libvirt.yaml
     with:
+      caa_image: ${{ inputs.registry }}/cloud-api-adaptor:${{ inputs.caa_image_tag }}-dev
       podvm_image: ${{ inputs.registry }}/podvm-${{ matrix.provider }}-${{ matrix.os }}-${{ matrix.arch }}:${{ inputs.podvm_image_tag }}
       install_directory_artifact: install_directory
-      git_ref: ${{ inputs.git_ref }}
\ No newline at end of file
+      git_ref: ${{ inputs.git_ref }}