diff --git a/Makefile b/Makefile index 3cc8ed3754..59d22cf6a7 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ DOCKER_CONFIG ?= "$(HOME)/.docker" vm-driver ?= "kvm" # Default OCP version in which the OpenShift apps are going to run -ocp_version ?= "4.12" +ocp_version ?= "4.13" ### ### These variables should not need tweaking. ### diff --git a/build/integration-test.sh b/build/integration-test.sh index 5df0f3bf43..a64eea8c59 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -36,6 +36,7 @@ OC_APPS4_5="MysqlDBDepConfig4_5|MongoDBDepConfig4_5|PostgreSQLDepConfig4_5" OC_APPS4_10="MysqlDBDepConfig4_10|PostgreSQLDepConfig4_10" OC_APPS4_11="MysqlDBDepConfig4_11|PostgreSQLDepConfig4_11" OC_APPS4_12="MysqlDBDepConfig4_12|PostgreSQLDepConfig4_12" +OC_APPS4_13="MysqlDBDepConfig4_13|PostgreSQLDepConfig4_13" check_dependencies() { # Check if minio is already deployed @@ -59,7 +60,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, 4.5, 4.10, 4.11, 4.12. + 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, 4.10, 4.11, 4.12, 4.13. EOM exit 1 @@ -99,6 +100,9 @@ case "${1}" in "4.12") TEST_APPS=${OC_APPS4_12} ;; + "4.13") + TEST_APPS=${OC_APPS4_13} + ;; *) usage ;; diff --git a/pkg/app/utils.go b/pkg/app/utils.go index 2011d528c2..c53dd6a99b 100644 --- a/pkg/app/utils.go +++ b/pkg/app/utils.go @@ -47,6 +47,8 @@ const ( TemplateVersionOCP4_11 DBTemplate = "release-4.11" // TemplateVersionOCP4_12 stores version of db template 4.12 TemplateVersionOCP4_12 DBTemplate = "release-4.12" + // TemplateVersionOCP4_13 stores version of db template 4.13 + TemplateVersionOCP4_13 DBTemplate = "release-4.13" ) type storage string diff --git a/pkg/testing/integration_register.go b/pkg/testing/integration_register.go index 98d5798e3b..0164da179d 100644 --- a/pkg/testing/integration_register.go +++ b/pkg/testing/integration_register.go @@ -520,3 +520,33 @@ var _ = Suite(&PostgreSQLDepConfig4_12{ profile: newSecretProfile(), }, }) + +// MysqlDBDepConfig4_13 for Mysql Instance that is deployed through DeploymentConfig on OpenShift cluster +type MysqlDBDepConfig4_13 struct { + IntegrationSuite +} + +var _ = Suite(&MysqlDBDepConfig4_13{ + IntegrationSuite{ + name: "mysqldc", + namespace: "mysqldc4-13-test", + app: app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_13, app.EphemeralStorage, "8.0"), + bp: app.NewBlueprint("mysql-dep-config", "", true), + profile: newSecretProfile(), + }, +}) + +// PostgreSQLDepConfig4_13 for PostgreSQL deployed on openshift cluster +type PostgreSQLDepConfig4_13 struct { + IntegrationSuite +} + +var _ = Suite(&PostgreSQLDepConfig4_13{ + IntegrationSuite{ + name: "postgresdepconf", + namespace: "postgresdepconf4-13-test", + app: app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_13, app.EphemeralStorage), + bp: app.NewBlueprint("postgres-dep-config", "", true), + profile: newSecretProfile(), + }, +})