OCM-13960 | ci: Add a new paramter : OPENSHIFT_VERSION

Author: yingzhanredhat

tests/ci/config/config.go

@@ -50,6 +50,7 @@ type TestConfig struct {
 type GlobalENVVariables struct {
 	ChannelGroup          string `env:"CHANNEL_GROUP" default:""`
 	Version               string `env:"VERSION" default:""`
+	OpenshiftVersion      string `env:"OPENSHIFT_VERSION" default:""`
 	Region                string `env:"REGION" default:""`
 	ProvisionShard        string `env:"PROVISION_SHARD" default:""`
 	NamePrefix            string `env:"NAME_PREFIX"`
@@ -122,6 +123,7 @@ func init() {
 	Test.GlobalENV = &GlobalENVVariables{
 		ChannelGroup:          os.Getenv("CHANNEL_GROUP"),
 		Version:               os.Getenv("VERSION"),
+		OpenshiftVersion:      os.Getenv("OPENSHIFT_VERSION"),
 		Region:                os.Getenv("REGION"),
 		ProvisionShard:        os.Getenv("PROVISION_SHARD"),
 		NamePrefix:            os.Getenv("NAME_PREFIX"),

tests/utils/handler/profile.go

@@ -103,10 +103,16 @@ func LoadProfileYamlFileByENV() *Profile {
 			config.Test.GlobalENV.ChannelGroup)
 		profile.ChannelGroup = config.Test.GlobalENV.ChannelGroup
 	}
-	if config.Test.GlobalENV.Version != "" {
-		log.Logger.Infof("Got global env settings for VERSION, overwritten the profile setting with value %s",
-			config.Test.GlobalENV.Version)
-		profile.Version = config.Test.GlobalENV.Version
+	if config.Test.GlobalENV.Version != "" || config.Test.GlobalENV.OpenshiftVersion != "" {
+		if config.Test.GlobalENV.Version != "" {
+			log.Logger.Infof("Got global env settings for VERSION, overwritten the profile setting with value %s",
+				config.Test.GlobalENV.OpenshiftVersion)
+			profile.Version = config.Test.GlobalENV.Version
+		} else {
+			log.Logger.Infof("Got global env settings for OPENSHIFT_VERSION, overwritten the profile setting with value %s",
+				config.Test.GlobalENV.Version)
+			profile.Version = config.Test.GlobalENV.OpenshiftVersion
+		}
 	}
 	if config.Test.GlobalENV.Region != "" {
 		log.Logger.Infof("Got global env settings for REGION, overwritten the profile setting with value %s",