From d289f24d578a851a35e09f12aa7a14ce486021d3 Mon Sep 17 00:00:00 2001 From: Eric Nadeau Date: Mon, 13 Jun 2022 13:53:40 -0400 Subject: [PATCH 1/6] Copying https://github.com/kanisterio/kanister/pull/1181/files --- pkg/app/utils.go | 4 ++-- pkg/testing/integration_register.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/app/utils.go b/pkg/app/utils.go index 61c478dfc9..52dfff9e75 100644 --- a/pkg/app/utils.go +++ b/pkg/app/utils.go @@ -33,8 +33,8 @@ const ( TemplateVersionOCP4_4 DBTemplate = "release-4.4" // TemplateVersionOCP4_5 stores version of db template 4.5 TemplateVersionOCP4_5 DBTemplate = "release-4.5" - // TemplateVersionOCP4_9 stores version of db template 4.9 - TemplateVersionOCP4_9 DBTemplate = "release-4.9" + // TemplateVersionOCP4_10 stores version of db template 4.10 + TemplateVersionOCP4_10 DBTemplate = "release-4.10" ) type storage string diff --git a/pkg/testing/integration_register.go b/pkg/testing/integration_register.go index d8eeb4db09..3adfc52cb5 100644 --- a/pkg/testing/integration_register.go +++ b/pkg/testing/integration_register.go @@ -410,7 +410,7 @@ var _ = Suite(&MysqlDBDepConfig4_9{ IntegrationSuite{ name: "mysqldc", namespace: "mysqldc4-9-test", - app: app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_9, app.EphemeralStorage, "8.0"), + app: app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_10, app.EphemeralStorage, "8.0"), bp: app.NewBlueprint("mysql-dep-config", "", true), profile: newSecretProfile(), }, @@ -425,7 +425,7 @@ var _ = Suite(&MongoDBDepConfig4_9{ IntegrationSuite{ name: "mongodb", namespace: "mongodb4-9-test", - app: app.NewMongoDBDepConfig("mongodeploymentconfig", app.TemplateVersionOCP4_9, app.EphemeralStorage), + app: app.NewMongoDBDepConfig("mongodeploymentconfig", app.TemplateVersionOCP4_10, app.EphemeralStorage), bp: app.NewBlueprint("mongo-dep-config", "", true), profile: newSecretProfile(), }, @@ -440,7 +440,7 @@ var _ = Suite(&PostgreSQLDepConfig4_9{ IntegrationSuite{ name: "postgresdepconf", namespace: "postgresdepconf4-5-test", - app: app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_9, app.EphemeralStorage), + app: app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_10, app.EphemeralStorage), bp: app.NewBlueprint("postgres-dep-config", "", true), profile: newSecretProfile(), }, From 406e2e38fef2907aed6c782dac4eba3852d681b0 Mon Sep 17 00:00:00 2001 From: Eric Nadeau Date: Mon, 13 Jun 2022 14:10:47 -0400 Subject: [PATCH 2/6] Copying https://github.com/kanisterio/kanister/pull/1191/files --- Makefile | 2 +- build/integration-test.sh | 6 +++--- pkg/testing/integration_register.go | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 1b38baed97..f269194975 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ DOCKER_CONFIG ?= "$(HOME)/.docker" # Mention the vm-driver that should be used to install OpenShift vm-driver ?= "kvm" # Default OCP version in which the OpenShift apps are going to run -ocp_version ?= "4.9" +ocp_version ?= "4.10" ### ### These variables should not need tweaking. ### diff --git a/build/integration-test.sh b/build/integration-test.sh index 0f39330da2..a287604d0c 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -32,7 +32,7 @@ OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4" OC_APPS4_5="MysqlDBDepConfig4_5|MongoDBDepConfig4_5|PostgreSQLDepConfig4_5" # MongoDB is not provided as external DB template in release 4.9 anymore # https://github.com/openshift/origin/commit/4ea9e6c5961eb815c200df933eee30c48a5c9166 -OC_APPS4_9="MysqlDBDepConfig4_9|PostgreSQLDepConfig4_9" +OC_APPS4_10="MysqlDBDepConfig4_10|PostgreSQLDepConfig4_10" check_dependencies() { # Check if minio is already deployed @@ -87,8 +87,8 @@ case "${1}" in "4.5") TEST_APPS=${OC_APPS4_5} ;; - "4.9") - TEST_APPS=${OC_APPS4_9} + "4.10") + TEST_APPS=${OC_APPS4_10} ;; *) usage diff --git a/pkg/testing/integration_register.go b/pkg/testing/integration_register.go index 3adfc52cb5..41dcc51593 100644 --- a/pkg/testing/integration_register.go +++ b/pkg/testing/integration_register.go @@ -402,14 +402,14 @@ var _ = Suite(&Kafka{ }) // Mysql Instance that is deployed through DeploymentConfig on OpenShift cluster -type MysqlDBDepConfig4_9 struct { +type MysqlDBDepConfig4_10 struct { IntegrationSuite } -var _ = Suite(&MysqlDBDepConfig4_9{ +var _ = Suite(&MysqlDBDepConfig4_10{ IntegrationSuite{ name: "mysqldc", - namespace: "mysqldc4-9-test", + namespace: "mysqldc4-10-test", app: app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_10, app.EphemeralStorage, "8.0"), bp: app.NewBlueprint("mysql-dep-config", "", true), profile: newSecretProfile(), @@ -417,14 +417,14 @@ var _ = Suite(&MysqlDBDepConfig4_9{ }) // MongoDB deployed on openshift cluster -type MongoDBDepConfig4_9 struct { +type MongoDBDepConfig4_10 struct { IntegrationSuite } -var _ = Suite(&MongoDBDepConfig4_9{ +var _ = Suite(&MongoDBDepConfig4_10{ IntegrationSuite{ name: "mongodb", - namespace: "mongodb4-9-test", + namespace: "mongodb4-10-test", app: app.NewMongoDBDepConfig("mongodeploymentconfig", app.TemplateVersionOCP4_10, app.EphemeralStorage), bp: app.NewBlueprint("mongo-dep-config", "", true), profile: newSecretProfile(), @@ -432,11 +432,11 @@ var _ = Suite(&MongoDBDepConfig4_9{ }) // PostgreSQL deployed on openshift cluster -type PostgreSQLDepConfig4_9 struct { +type PostgreSQLDepConfig4_10 struct { IntegrationSuite } -var _ = Suite(&PostgreSQLDepConfig4_9{ +var _ = Suite(&PostgreSQLDepConfig4_10{ IntegrationSuite{ name: "postgresdepconf", namespace: "postgresdepconf4-5-test", From b0fe289e8997f3fe253a17c870b1b7f5b884258a Mon Sep 17 00:00:00 2001 From: Eric Nadeau Date: Mon, 13 Jun 2022 14:11:14 -0400 Subject: [PATCH 3/6] Changing PostgreSQLDepConfig4_10's namespace from 4.5 to 4.10 --- pkg/testing/integration_register.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/testing/integration_register.go b/pkg/testing/integration_register.go index 41dcc51593..9363ade87e 100644 --- a/pkg/testing/integration_register.go +++ b/pkg/testing/integration_register.go @@ -439,7 +439,7 @@ type PostgreSQLDepConfig4_10 struct { var _ = Suite(&PostgreSQLDepConfig4_10{ IntegrationSuite{ name: "postgresdepconf", - namespace: "postgresdepconf4-5-test", + namespace: "postgresdepconf4-10-test", app: app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_10, app.EphemeralStorage), bp: app.NewBlueprint("postgres-dep-config", "", true), profile: newSecretProfile(), From 0d5bdda64171dcf2c84c4701a765daa708a6b951 Mon Sep 17 00:00:00 2001 From: Eric Nadeau Date: Tue, 14 Jun 2022 11:11:37 -0400 Subject: [PATCH 4/6] Updating a comment to add 4.10 to a list of supported versions --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index a287604d0c..e717318d83 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -56,7 +56,7 @@ Where app-type is one of [short|all]: all: Runs e2e integration tests for all apps OR You can also provide regex to match apps you want to run. - openshift ocp_version=: Runs e2e integration tests for specific version of OpenShift apps, OCP version can be provided using ocp_version argument. Currently supported versions are 3.11, 4.4 and 4.5. + openshift ocp_version=: Runs e2e integration tests for specific version of OpenShift apps, OCP version can be provided using ocp_version argument. Currently supported versions are 3.11, 4.4, 4.5 and 4.10. EOM exit 1 From 9c1d0ac3eebfa54ad0271d983600e62955f1d1aa Mon Sep 17 00:00:00 2001 From: Eric Nadeau Date: Fri, 17 Jun 2022 15:30:10 -0400 Subject: [PATCH 5/6] Disabling call to check_dependencies for testing purpose --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index e717318d83..b10f2e3299 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -100,7 +100,7 @@ case "${1}" in ;; esac -check_dependencies +#check_dependencies echo "Running integration tests:" pushd ${INTEGRATION_TEST_DIR} go test -v ${TEST_OPTIONS} -check.f "${TEST_APPS}" -installsuffix "static" . -check.v From 8a99ed5abbee3bcca191ae1c8154eaaec6f1d531 Mon Sep 17 00:00:00 2001 From: Eric Nadeau Date: Tue, 21 Jun 2022 12:18:16 -0400 Subject: [PATCH 6/6] Revert "Disabling call to check_dependencies for testing purpose" This reverts commit 9c1d0ac3eebfa54ad0271d983600e62955f1d1aa. --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index b10f2e3299..e717318d83 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -100,7 +100,7 @@ case "${1}" in ;; esac -#check_dependencies +check_dependencies echo "Running integration tests:" pushd ${INTEGRATION_TEST_DIR} go test -v ${TEST_OPTIONS} -check.f "${TEST_APPS}" -installsuffix "static" . -check.v