feat: added new OCP versions and adjusted tests (#577)

Author: vbontempi

tests/other_test.go

@@ -11,7 +11,7 @@ import (
 func TestRunBasicExample(t *testing.T) {
 	t.Parallel()
 
-	options := setupOptions(t, "base-ocp", basicExampleDir, ocpVersion5)
+	options := setupOptions(t, "base-ocp", basicExampleDir, ocpVersion6)
 
 	output, err := options.RunTestConsistency()
 
@@ -94,7 +94,7 @@ func TestRunAddRulesToSGExample(t *testing.T) {
 		// Do not hard fail the test if the implicit destroy steps fail to allow a full destroy of resource to occur
 		ImplicitRequired: false,
 		TerraformVars: map[string]interface{}{
-			"ocp_version": ocpVersion3,
+			"ocp_version": ocpVersion4,
 		},
 	})
 	output, err := options.RunTestConsistency()
@@ -139,7 +139,7 @@ func TestCrossKmsSupportExample(t *testing.T) {
 			"kms_instance_guid":    permanentResources["kp_us_south_guid"],
 			"kms_key_id":           permanentResources["kp_us_south_root_key_id"],
 			"kms_cross_account_id": permanentResources["ge_ops_account_id"],
-			"ocp_version":          ocpVersion4,
+			"ocp_version":          ocpVersion5,
 		},
 		ImplicitDestroy: []string{
 			// workaround for the issue https://github.ibm.com/GoldenEye/issues/issues/10743

tests/pr_test.go

@@ -27,11 +27,12 @@ const customsgExampleDir = "examples/custom_sg"
 const yamlLocation = "../common-dev-assets/common-go-assets/common-permanent-resources.yaml"
 
 // Ensure there is one test per supported OCP version
-const ocpVersion1 = "4.16" // used by TestRunUpgradeAdvancedExample , TestFSCloudInSchematic and TestRunMultiClusterExample
-const ocpVersion2 = "4.15" // used by TestCustomSGExample and TestRunCustomsgExample
-const ocpVersion3 = "4.14" // used by TestRunAdvancedExample and TestRunAddRulesToSGExample
-const ocpVersion4 = "4.13" // used by TestCrossKmsSupportExample
-const ocpVersion5 = "4.12" // used by TestRunBasicExample
+const ocpVersion1 = "4.17" // used by TestRunUpgradeAdvancedExample , TestFSCloudInSchematic and TestRunMultiClusterExample
+const ocpVersion2 = "4.16" // used by TestCustomSGExample and TestRunCustomsgExample
+const ocpVersion3 = "4.15" // used by TestRunAdvancedExample
+const ocpVersion4 = "4.14" // used by TestRunAddRulesToSGExample
+const ocpVersion5 = "4.13" // used by TestCrossKmsSupportExample
+const ocpVersion6 = "4.12" // used by TestRunBasicExample
 
 var sharedInfoSvc *cloudinfo.CloudInfoService
 var permanentResources map[string]interface{}
@@ -76,7 +77,7 @@ func setupOptions(t *testing.T, prefix string, terraformDir string, ocpVersion s
 func TestRunAdvancedExample(t *testing.T) {
 	t.Parallel()
 
-	options := setupOptions(t, "base-ocp-adv", advancedExampleDir, ocpVersion2)
+	options := setupOptions(t, "base-ocp-adv", advancedExampleDir, ocpVersion3)
 	options.PostApplyHook = getClusterIngress
 
 	output, err := options.RunTestConsistency()

variables.tf

@@ -188,6 +188,7 @@ variable "ocp_version" {
       var.ocp_version == "4.14",
       var.ocp_version == "4.15",
       var.ocp_version == "4.16",
+      var.ocp_version == "4.17",
     ])
     error_message = "The specified ocp_version is not of the valid versions."
   }