x

davidhadas · Oct 23, 2024 · 53198dd · 53198dd
1 parent c7cb0a9
commit 53198dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 30 deletions.
diff --git a/.github/workflows/e2e_libvirt.yaml b/.github/workflows/e2e_libvirt.yaml
@@ -144,6 +144,12 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Checkout Trustee Operator Repository
+        run: |
+          test/utils/checkout_trustee_operator.sh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: run tests
         id: runTests
         env:

diff --git a/src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json b/src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json
@@ -1,14 +1,6 @@
 {
-<<<<<<< HEAD
-    "secure_comms": ["none", "withoutKbs"],
-    "os": ["ubuntu"],
-    "provider": ["generic"],
-    "arch": ["amd64"]
-}
-=======
     "secure_comms": ["none"],
     "os": ["ubuntu"],
     "provider": ["generic"],
     "arch": ["amd64"]
 }
->>>>>>> 0c2fb6fd (SecureComms: Add testing facility for e2e tests)
diff --git a/src/cloud-api-adaptor/test/utils/checkout_trustee_operator.sh b/src/cloud-api-adaptor/test/utils/checkout_trustee_operator.sh
@@ -10,27 +10,14 @@ TEST_DIR=$(cd "$(dirname "$(realpath "$0")")/../"; pwd)
 
 VERSIONS_YAML_PATH=$(realpath "${TEST_DIR}/../versions.yaml")
 
-KBS_REPO=$(yq -e '.git.kbs.url' "${VERSIONS_YAML_PATH}")
-KBS_VERSION=$(yq -e '.git.kbs.reference' "${VERSIONS_YAML_PATH}")
+TRUSTEE_OPERATOR_REPO=$(yq -e '.git.trustee-operator.url' "${VERSIONS_YAML_PATH}")
+TRUSTEE_OPERATOR_VERSION=$(yq -e '.git.trustee-operator.reference' "${VERSIONS_YAML_PATH}")
 
-echo "${KBS_REPO}, ${KBS_VERSION}"
+echo "${TRUSTEE_OPERATOR_REPO}, ${TRUSTEE_OPERATOR_VERSION}"
 
-rm -rf "${TEST_DIR}/trustee"
-git clone "${KBS_REPO}" "${TEST_DIR}/trustee"
-pushd "${TEST_DIR}/trustee"
-git checkout "${KBS_VERSION}"
-KBS_SHA="$(git rev-parse HEAD)"
-
-# kbs-client setup - to be removed when we use the cached version instead
-sudo apt-get update -y
-sudo apt-get install -y build-essential pkg-config libssl-dev
-pushd kbs
-make CLI_FEATURES=sample_only cli
+rm -rf "${TEST_DIR}/trustee_operator"
+git clone "${TRUSTEE_OPERATOR_REPO}" "${TEST_DIR}/trustee_operator"
+pushd "${TEST_DIR}/trustee_operator"
+git checkout "${TRUSTEE_OPERATOR_VERSION}"
+TRUSTEE_OPERATOR_SHA="$(git rev-parse HEAD)"
 popd
-
-pushd kbs/config/kubernetes/base/
-# Trustee only updates their staging image reliably with sha tags,
-# so switch to use that and convert the version to the sha
-kustomize edit set image kbs-container-image=ghcr.io/confidential-containers/staged-images/kbs:${KBS_SHA}
-# For debugging
-echo "Trustee deployment: $(cat kustomization.yaml). Images: $(grep -A 5 images: kustomization.yaml)"
diff --git a/src/cloud-api-adaptor/versions.yaml b/src/cloud-api-adaptor/versions.yaml
@@ -46,7 +46,7 @@ git:
     reference: v1.5.0
   kbs:
     url: https://github.com/confidential-containers/trustee
-    reference: v0.10.1
+    reference: f287fcd60b0b3ddbef5546d646669813b9e68f8d
   trustee-operator:
     url: https://github.com/confidential-containers/trustee-operator
     reference: 9e4b0d15cfc53ad68248535d11d134a5c7ade5d9