ci: upgrade test cases

Author: ludwig-mueller

tests/common-go-assets/cloudinfo-region-power-prefs.yaml

@@ -5,3 +5,9 @@
 - name: eu-de-1
   useForTest: true
   testPriority: 2
+- name: tor01
+  useForTest: true
+  testPriority: 3
+- name: tok04
+  useForTest: true
+  testPriority: 4

tests/pr_test.go

@@ -15,6 +15,7 @@ import (
 // Use existing resource group
 const resourceGroup = "geretain-test-resources"
 const defaultExampleTerraformDir = "solutions/standard"
+const quickstartExampleTerraformDir = "solutions/standard-plus-vsi"
 
 var sharedInfoSvc *cloudinfo.CloudInfoService
 
@@ -33,7 +34,7 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func setupOptions(t *testing.T, prefix string) *testhelper.TestOptions {
+func setupOptionsStandardSolution(t *testing.T, prefix string) *testhelper.TestOptions {
 
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:            t,
@@ -70,19 +71,80 @@ func setupOptions(t *testing.T, prefix string) *testhelper.TestOptions {
 	return options
 }
 
-func TestRunBranchExample(t *testing.T) {
+func TestRunBranchStandardExample(t *testing.T) {
 	t.Parallel()
 
-	options := setupOptions(t, "pvs-i-b")
+	options := setupOptionsStandardSolution(t, "pvs-i-b")
 
 	output, err := options.RunTestConsistency()
 	assert.Nil(t, err, "This should not have errored")
 	assert.NotNil(t, output, "Expected some output")
 }
 
-func TestRunMainExample(t *testing.T) {
+func TestRunMainStandardExample(t *testing.T) {
 	t.Parallel()
-	options := setupOptions(t, "pvs-i-m")
+	options := setupOptionsStandardSolution(t, "pvs-i-m")
+
+	output, err := options.RunTestUpgrade()
+	if !options.UpgradeTestSkipped {
+		assert.Nil(t, err, "This should not have errored")
+		assert.NotNil(t, output, "Expected some output")
+	}
+}
+
+// quickstart =standard-plus-vsi
+func setupOptionsQuickstartSolution(t *testing.T, prefix string) *testhelper.TestOptions {
+
+	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
+		Testing:            t,
+		TerraformDir:       quickstartExampleTerraformDir,
+		Prefix:             prefix,
+		ResourceGroup:      resourceGroup,
+		Region:             "us-south", // specify default region to skip best choice query
+		DefaultRegion:      "dal10",
+		BestRegionYAMLPath: "./common-go-assets/cloudinfo-region-power-prefs.yaml", // specific to powervs zones
+		// temporary workaround for BSS backend issue
+		ImplicitDestroy: []string{
+			"module.standard.module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups",
+		},
+	})
+
+	// query for best zone to deploy powervs example, based on current connection count
+	// NOTE: this is why we do not want to run multiple tests in parallel.
+	options.Region, _ = testhelper.GetBestPowerSystemsRegionO(options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], options.BestRegionYAMLPath, options.DefaultRegion,
+		testhelper.TesthelperTerraformOptions{CloudInfoService: sharedInfoSvc})
+	// if for any reason the region is empty at this point, such as error, use default
+	if len(options.Region) == 0 {
+		options.Region = options.DefaultRegion
+	}
+
+	options.TerraformVars = map[string]interface{}{
+		"prefix":                      options.Prefix,
+		"powervs_resource_group_name": options.ResourceGroup,
+		"external_access_ip":          "0.0.0.0/0",
+		"tshirt_size": map[string]string{
+			"image":       "7300-02-01",
+			"tshirt_size": "aix_xs",
+		},
+		"powervs_zone": options.Region,
+	}
+
+	return options
+}
+
+func TestRunBranchQuickstartExample(t *testing.T) {
+	t.Parallel()
+
+	options := setupOptionsQuickstartSolution(t, "pvs-qs-b")
+
+	output, err := options.RunTestConsistency()
+	assert.Nil(t, err, "This should not have errored")
+	assert.NotNil(t, output, "Expected some output")
+}
+
+func TestRunMainQuickstartExample(t *testing.T) {
+	t.Parallel()
+	options := setupOptionsQuickstartSolution(t, "pvs-qs-m")
 
 	output, err := options.RunTestUpgrade()
 	if !options.UpgradeTestSkipped {