fix

Author: kasiakoziol

.github/workflows/helm-test-workflow.yml

@@ -101,7 +101,7 @@ jobs:
       - name: Install kuttl
         run: |
           sudo curl -LO https://github.com/kudobuilder/kuttl/releases/download/v0.22.0/kuttl_0.22.0_linux_x86_64.tar.gz
-          sudo tar -xvzf kuttl_0.12.0_linux_x86_64.tar.gz
+          sudo tar -xvzf kuttl_0.22.0_linux_x86_64.tar.gz
           sudo chmod +x  kubectl-kuttl
           sudo mv kubectl-kuttl /usr/local/bin/kubectl-kuttl
       - name: Install Python

test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go

@@ -14,6 +14,8 @@
 package indingsep
 
 import (
+	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -141,6 +143,11 @@ var (
 		"remote_queue.sqs_smartbus.retry_policy = max_count",
 		"remote_queue.max_count.sqs_smartbus.max_retries_per_part = 4"}
 	outputsShouldNotContain = append(inputs, "remote_queue.sqs_smartbus.send_interval = 5s")
+
+	testS3Bucket  = os.Getenv("TEST_INDEXES_S3_BUCKET")
+	appListV1     = []string{}
+	currDir, _    = os.Getwd()
+	downloadDirV1 = filepath.Join(currDir, "s1appfwV1-"+testenv.RandomDNSName(4))
 )
 
 // TestBasic is the main entry point

test/index_and_ingestion_separation/index_and_ingestion_separation_test.go

@@ -59,8 +59,10 @@ var _ = Describe("indingsep test", func() {
 				},
 			},
 		}
-		s3TestDir = "s1appfw-" + testenv.RandomDNSName(4)
+
+		s3TestDir = "icappfw-" + testenv.RandomDNSName(4)
 		appSourceVolumeName = "appframework-test-volume-" + testenv.RandomDNSName(3)
+		appListV1 = testenv.BasicApps
 	})
 
 	AfterEach(func() {
@@ -131,6 +133,12 @@ var _ = Describe("indingsep test", func() {
 			testcaseEnvInst.Log.Info("Create Service Account")
 			testcaseEnvInst.CreateServiceAccount(serviceAccountName)
 
+			// Upload apps to S3
+			testcaseEnvInst.Log.Info("Upload apps to S3")
+			appFileList := testenv.GetAppFileList(appListV1)
+			_, err := testenv.UploadFilesToS3(testS3Bucket, s3TestDir, appFileList, downloadDirV1)
+			Expect(err).To(Succeed(), "Unable to upload V1 apps to S3 test directory for IngestorCluster")
+
 			// Deploy Ingestor Cluster with additional configurations (similar to standalone app framework test)
 			appSourceName := "appframework-" + enterpriseApi.ScopeLocal + testenv.RandomDNSName(3)
 			appFrameworkSpec := testenv.GenerateAppFrameworkSpec(ctx, testcaseEnvInst, appSourceVolumeName, enterpriseApi.ScopeLocal, appSourceName, s3TestDir, 60)
@@ -176,7 +184,7 @@ var _ = Describe("indingsep test", func() {
 			}
 
 			testcaseEnvInst.Log.Info("Deploy Ingestor Cluster with additional configurations")
-			_, err := deployment.DeployIngestorClusterWithAdditionalConfiguration(ctx, ic)
+			_, err = deployment.DeployIngestorClusterWithAdditionalConfiguration(ctx, ic)
 			Expect(err).To(Succeed(), "Unable to deploy Ingestor Cluster")
 
 			// Ensure that Ingestor Cluster is in Ready phase