CSPL-3964: Fixing failing tests from previous failed run.

Author: gabrielm-splunk

.github/workflows/build-test-push-workflow.yml

@@ -59,6 +59,8 @@ jobs:
       SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
       ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
+
     steps:
     - name: Set up cosign
       uses: sigstore/cosign-installer@main
@@ -115,6 +117,8 @@ jobs:
       ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }}
+      SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
+
     steps:
     - name: Set up cosign
       uses: sigstore/cosign-installer@main
@@ -189,6 +193,8 @@ jobs:
       EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
+
     steps:
       - name: Set Test Cluster Name
         run: |

test/appframework_aws/c3/appframework_aws_suite_test.go

@@ -23,6 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/joho/godotenv"
+	"github.com/splunk/splunk-operator/pkg/splunk/enterprise"
 	"github.com/splunk/splunk-operator/test/testenv"
 )
 
@@ -100,6 +101,22 @@ func loadEnvFile() error {
 
 var _ = BeforeSuite(func() {
 	var err error
+
+	// Override script locations to use absolute paths for integration tests
+	// These are relative to test/appframework_aws/c3/, so we go up 3 levels to project root
+	enterprise.GetReadinessScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../../tools/k8_probes/readinessProbe.sh")
+		return fileLocation
+	}
+	enterprise.GetLivenessScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../../tools/k8_probes/livenessProbe.sh")
+		return fileLocation
+	}
+	enterprise.GetStartupScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../../tools/k8_probes/startupProbe.sh")
+		return fileLocation
+	}
+
 	testenvInstance, err = testenv.NewDefaultTestEnv(testSuiteName)
 	Expect(err).ToNot(HaveOccurred())
 

test/appframework_aws/m4/appframework_aws_suite_test.go

@@ -22,6 +22,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/splunk/splunk-operator/pkg/splunk/enterprise"
 	"github.com/splunk/splunk-operator/test/testenv"
 )
 
@@ -63,6 +64,22 @@ func TestBasic(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	var err error
+
+	// Override script locations to use absolute paths for integration tests
+	// These are relative to test/appframework_aws/m4/, so we go up 3 levels to project root
+	enterprise.GetReadinessScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../../tools/k8_probes/readinessProbe.sh")
+		return fileLocation
+	}
+	enterprise.GetLivenessScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../../tools/k8_probes/livenessProbe.sh")
+		return fileLocation
+	}
+	enterprise.GetStartupScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../../tools/k8_probes/startupProbe.sh")
+		return fileLocation
+	}
+
 	testenvInstance, err = testenv.NewDefaultTestEnv(testSuiteName)
 	Expect(err).ToNot(HaveOccurred())
 

test/monitoring_console/monitoring_console_suite_test.go

@@ -16,12 +16,14 @@
 package monitoringconsoletest
 
 import (
+	"path/filepath"
 	"testing"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/splunk/splunk-operator/pkg/splunk/enterprise"
 	"github.com/splunk/splunk-operator/test/testenv"
 )
 
@@ -52,6 +54,22 @@ func TestBasic(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	var err error
+
+	// Override script locations to use absolute paths for integration tests
+	// These are relative to test/monitoring_console/, so we go up 2 levels to project root
+	enterprise.GetReadinessScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../tools/k8_probes/readinessProbe.sh")
+		return fileLocation
+	}
+	enterprise.GetLivenessScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../tools/k8_probes/livenessProbe.sh")
+		return fileLocation
+	}
+	enterprise.GetStartupScriptLocation = func() string {
+		fileLocation, _ := filepath.Abs("../../tools/k8_probes/startupProbe.sh")
+		return fileLocation
+	}
+
 	testenvInstance, err = testenv.NewDefaultTestEnv(testSuiteName)
 	Expect(err).ToNot(HaveOccurred())
 })

test/testenv/s3utils.go

@@ -316,11 +316,19 @@ func DisableAppsToS3(downloadDir string, appFileList []string, s3TestDir string)
 		// Tar disabled app folder
 		tarDestination := disabledAppsFolder + "/" + key
 		cmd = exec.Command("tar", "-czf", tarDestination, "--directory", untarredCurrentAppFolder, appFolderName)
-		cmd.Run()
+		err = cmd.Run()
+		if err != nil {
+			log.Fatalf("Failed to create tar archive for disabled app %s: %v", key, err)
+			return nil, err
+		}
 	}
 
 	// Upload disabled apps to S3
-	uploadedFiles, _ := UploadFilesToS3(testIndexesS3Bucket, s3TestDir, appFileList, disabledAppsFolder)
+	uploadedFiles, err := UploadFilesToS3(testIndexesS3Bucket, s3TestDir, appFileList, disabledAppsFolder)
+	if err != nil {
+		log.Fatalf("Failed to upload disabled apps to S3: %v", err)
+		return nil, err
+	}
 
 	return uploadedFiles, nil
 }