[K10-13107] support of k10@OCP 4.11 in templates (#1681)

Reference appliactions that were used for k10@OCP test
should have 4.11 prefix to separate them from 4.10 in case of
possible changes

related PR in k10
kastenhq/k10#17063
kastenhq/k10#17064

Co-authored-by: Vladislav Naumov <vladislav.naumov@PRG10457-MacBook-Pro.local>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Makefile

@@ -43,7 +43,7 @@ DOCKER_CONFIG ?= "$(HOME)/.docker"
 vm-driver ?= "kvm"
 
 # Default OCP version in which the OpenShift apps are going to run
-ocp_version ?= "4.10"
+ocp_version ?= "4.11"
 ###
 ### These variables should not need tweaking.
 ###

build/integration-test.sh

@@ -33,6 +33,7 @@ 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_10="MysqlDBDepConfig4_10|PostgreSQLDepConfig4_10"
+OC_APPS4_11="MysqlDBDepConfig4_11|PostgreSQLDepConfig4_11"
 
 check_dependencies() {
     # Check if minio is already deployed
@@ -56,7 +57,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=<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.
+  openshift ocp_version=<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.
 
 EOM
     exit 1
@@ -90,6 +91,9 @@ case "${1}" in
             "4.10")
                 TEST_APPS=${OC_APPS4_10}
                 ;;
+            "4.11")
+                TEST_APPS=${OC_APPS4_11}
+                ;;
             *)
                 usage
                 ;;

pkg/app/utils.go

@@ -35,6 +35,8 @@ const (
 	TemplateVersionOCP4_5 DBTemplate = "release-4.5"
 	// TemplateVersionOCP4_10 stores version of db template 4.10
 	TemplateVersionOCP4_10 DBTemplate = "release-4.10"
+	// TemplateVersionOCP4_11 stores version of db template 4.11
+	TemplateVersionOCP4_11 DBTemplate = "release-4.11"
 )
 
 type storage string

pkg/testing/integration_register.go

@@ -460,3 +460,33 @@ var _ = Suite(&PostgreSQLDepConfig4_10{
 		profile:   newSecretProfile(),
 	},
 })
+
+// MysqlDBDepConfig4_11 for Mysql Instance that is deployed through DeploymentConfig on OpenShift cluster
+type MysqlDBDepConfig4_11 struct {
+	IntegrationSuite
+}
+
+var _ = Suite(&MysqlDBDepConfig4_11{
+	IntegrationSuite{
+		name:      "mysqldc",
+		namespace: "mysqldc4-11-test",
+		app:       app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_11, app.EphemeralStorage, "8.0"),
+		bp:        app.NewBlueprint("mysql-dep-config", "", true),
+		profile:   newSecretProfile(),
+	},
+})
+
+// PostgreSQLDepConfig4_11 for PostgreSQL deployed on openshift cluster
+type PostgreSQLDepConfig4_11 struct {
+	IntegrationSuite
+}
+
+var _ = Suite(&PostgreSQLDepConfig4_11{
+	IntegrationSuite{
+		name:      "postgresdepconf",
+		namespace: "postgresdepconf4-11-test",
+		app:       app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_11, app.EphemeralStorage),
+		bp:        app.NewBlueprint("postgres-dep-config", "", true),
+		profile:   newSecretProfile(),
+	},
+})