test-e2e: Add check for validating kbs image and kbs image tag

Validate kbs image and kbs image tag only when deploy kbs is enabled. Signed-off-by: Kartik Joshi <[email protected]>
confidential-containers · Mar 6, 2024 · 887b892 · 887b892
1 parent 059bff6
commit 887b892
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
@@ -118,9 +118,12 @@ func TestMain(m *testing.M) {
 		var err error
 
 		// Get properties
+
 		props := provisioner.GetProperties(ctx, cfg)
-		if props["KBS_IMAGE"] == "" || props["KBS_IMAGE_TAG"] == "" {
-			return ctx, fmt.Errorf("kbs image not provided")
+		if shouldDeployKbs {
+			if props["KBS_IMAGE"] == "" || props["KBS_IMAGE_TAG"] == "" {
+				return ctx, fmt.Errorf("kbs image not provided")
+			}
 		}
 
 		if shouldProvisionCluster {

diff --git a/test/provisioner/azure/provision_azure.properties b/test/provisioner/azure/provision_azure.properties
@@ -17,4 +17,3 @@ IS_SELF_MANAGED_CLUSTER="false"
 # KBS configs
 KBS_IMAGE="${KBS_IMAGE}"
 KBS_IMAGE_TAG="${KBS_IMAGE_TAG}"
-DEPLOY_KBS="true"