MLE-15549: changes for handling diff test scenarios (#263)

barkhachoithani · web-flow · commit e8db5f273d98 · 2024-07-12T13:04:46.000-07:00
* changes for handling diff test scenarios

* removing allowPrivilegeEscalation as by default upgrade is using rootless
diff --git a/test/e2e/admin_secrets_test.go b/test/e2e/admin_secrets_test.go
@@ -88,6 +88,7 @@ func TestMlAdminSecrets(t *testing.T) {
 			"replicaCount":          "1",
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 
 		if strings.HasPrefix(initialChartVersion, "1.0") {
diff --git a/test/e2e/backup_restore_test.go b/test/e2e/backup_restore_test.go
@@ -220,6 +220,7 @@ func TestMlDbBackupRestore(t *testing.T) {
 			"replicaCount":          "1",
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podName = releaseName + "-marklogic-0"
diff --git a/test/e2e/clustering_test.go b/test/e2e/clustering_test.go
@@ -93,6 +93,7 @@ func TestClusterJoin(t *testing.T) {
 			"auth.adminPassword":    password,
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podZeroName = releaseName + "-marklogic-0"
diff --git a/test/e2e/env_param_test.go b/test/e2e/env_param_test.go
@@ -100,6 +100,7 @@ func TestEnableConvertersAndLicense(t *testing.T) {
 			"enableConverters":      "true",
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podName = releaseName + "-marklogic-0"
diff --git a/test/e2e/install_test.go b/test/e2e/install_test.go
@@ -103,6 +103,7 @@ func TestHelmInstall(t *testing.T) {
 			"replicaCount":          "2",
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podZeroName = releaseName + "-marklogic-0"
diff --git a/test/e2e/ready_test.go b/test/e2e/ready_test.go
@@ -95,6 +95,7 @@ func TestMarklogicReady(t *testing.T) {
 			"replicaCount":          "2",
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podZeroName = releaseName + "-marklogic-0"
diff --git a/test/e2e/scaling_test.go b/test/e2e/scaling_test.go
@@ -109,6 +109,7 @@ func TestHelmScaleUp(t *testing.T) {
 			"auth.adminPassword":    password,
 			"logCollection.enabled": "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podZeroName = releaseName + "-marklogic-0"
diff --git a/test/e2e/separate_nodes_test.go b/test/e2e/separate_nodes_test.go
@@ -279,6 +279,7 @@ func TestSeparateEDnode(t *testing.T) {
 			"auth.adminUsername":    username,
 			"auth.adminPassword":    password,
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		enodeUpgradeOptionsMap := map[string]string{
 			"persistence.enabled":   "true",
@@ -289,6 +290,7 @@ func TestSeparateEDnode(t *testing.T) {
 			"group.name":            "enode",
 			"group.enableXdqpSsl":   "false",
 			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			dnodePodName = dnodeReleaseName + "-marklogic-0"
diff --git a/test/e2e/tls_test.go b/test/e2e/tls_test.go
@@ -103,6 +103,7 @@ func TestTLSEnabledWithSelfSigned(t *testing.T) {
 			"tls.enableOnDefaultAppServers": "true",
 			"logCollection.enabled":         "false",
 			"allowLongHostnames":            "true",
+			"rootToRootlessUpgrade":         "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podName = releaseName + "-marklogic-0"
@@ -265,7 +266,8 @@ func TestTLSEnabledWithNamedCert(t *testing.T) {
 
 	if runUpgradeTest {
 		upgradeOptionsMap := map[string]string{
-			"allowLongHostnames": "true",
+			"allowLongHostnames":    "true",
+			"rootToRootlessUpgrade": "true",
 		}
 
 		if strings.HasPrefix(initialChartVersion, "1.0") {
diff --git a/test/hugePages/huge_pages_test.go b/test/hugePages/huge_pages_test.go
@@ -117,6 +117,7 @@ func TestHugePagesSettings(t *testing.T) {
 			"resources.limits.memory":        "8Gi",
 			"resources.requests.memory":      "8Gi",
 			"allowLongHostnames":             "true",
+			"rootToRootlessUpgrade":          "true",
 		}
 		if strings.HasPrefix(initialChartVersion, "1.0") {
 			podName = releaseName + "-marklogic-0"

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ func TestMlAdminSecrets(t *testing.T) {`
`88`	`88`	`"replicaCount": "1",`
`89`	`89`	`"logCollection.enabled": "false",`
`90`	`90`	`"allowLongHostnames": "true",`
	`91`	`+ "rootToRootlessUpgrade": "true",`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ func TestMlDbBackupRestore(t *testing.T) {`
`220`	`220`	`"replicaCount": "1",`
`221`	`221`	`"logCollection.enabled": "false",`
`222`	`222`	`"allowLongHostnames": "true",`
	`223`	`+ "rootToRootlessUpgrade": "true",`
`223`	`224`	`}`
`224`	`225`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`225`	`226`	`podName = releaseName + "-marklogic-0"`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ func TestClusterJoin(t *testing.T) {`
`93`	`93`	`"auth.adminPassword": password,`
`94`	`94`	`"logCollection.enabled": "false",`
`95`	`95`	`"allowLongHostnames": "true",`
	`96`	`+ "rootToRootlessUpgrade": "true",`
`96`	`97`	`}`
`97`	`98`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`98`	`99`	`podZeroName = releaseName + "-marklogic-0"`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ func TestEnableConvertersAndLicense(t *testing.T) {`
`100`	`100`	`"enableConverters": "true",`
`101`	`101`	`"logCollection.enabled": "false",`
`102`	`102`	`"allowLongHostnames": "true",`
	`103`	`+ "rootToRootlessUpgrade": "true",`
`103`	`104`	`}`
`104`	`105`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`105`	`106`	`podName = releaseName + "-marklogic-0"`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ func TestHelmInstall(t *testing.T) {`
`103`	`103`	`"replicaCount": "2",`
`104`	`104`	`"logCollection.enabled": "false",`
`105`	`105`	`"allowLongHostnames": "true",`
	`106`	`+ "rootToRootlessUpgrade": "true",`
`106`	`107`	`}`
`107`	`108`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`108`	`109`	`podZeroName = releaseName + "-marklogic-0"`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ func TestMarklogicReady(t *testing.T) {`
`95`	`95`	`"replicaCount": "2",`
`96`	`96`	`"logCollection.enabled": "false",`
`97`	`97`	`"allowLongHostnames": "true",`
	`98`	`+ "rootToRootlessUpgrade": "true",`
`98`	`99`	`}`
`99`	`100`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`100`	`101`	`podZeroName = releaseName + "-marklogic-0"`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ func TestHelmScaleUp(t *testing.T) {`
`109`	`109`	`"auth.adminPassword": password,`
`110`	`110`	`"logCollection.enabled": "false",`
`111`	`111`	`"allowLongHostnames": "true",`
	`112`	`+ "rootToRootlessUpgrade": "true",`
`112`	`113`	`}`
`113`	`114`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`114`	`115`	`podZeroName = releaseName + "-marklogic-0"`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ func TestHugePagesSettings(t *testing.T) {`
`117`	`117`	`"resources.limits.memory": "8Gi",`
`118`	`118`	`"resources.requests.memory": "8Gi",`
`119`	`119`	`"allowLongHostnames": "true",`
	`120`	`+ "rootToRootlessUpgrade": "true",`
`120`	`121`	`}`
`121`	`122`	`if strings.HasPrefix(initialChartVersion, "1.0") {`
`122`	`123`	`podName = releaseName + "-marklogic-0"`