Merge pull request #4 from cpinjani/ci_fixes1

CI fixes
rancher · Dec 10, 2023 · 1bfacca · 1bfacca
2 parents d0c19fe + a81bf98
commit 1bfacca
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -81,7 +81,11 @@ jobs:
         run: |
           gcloud compute instances create ${{ steps.generator.outputs.runner }} \
             --zone ${{ inputs.zone }} \
-            --source-instance-template ${{ inputs.runner_template }}
+            --source-instance-template ${{ inputs.runner_template }} &> /dev/null
+      - name: Allow traffic
+        run: |
+          gcloud compute instances add-tags ${{ steps.generator.outputs.runner }} \
+            --tags http-server,https-server --zone ${{ inputs.zone }}
       - name: Create PAT token secret
         run: |
           echo -n ${{ secrets.PAT_TOKEN }} \

diff --git a/Makefile b/Makefile
@@ -2,8 +2,7 @@
 ### USED BY CI ###
 ##################
 
-# TODO Run tests parallely to reduce suite running time
-STANDARD_TEST_OPTIONS= -v -r --timeout=4h --keep-going --randomize-all --randomize-suites 
+STANDARD_TEST_OPTIONS= -v -r --timeout=2h --keep-going --randomize-all --randomize-suites -poll-progress-interval=5m -procs=3
 
 install-k3s: ## Install K3s with default options
 	curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=${K3S_VERSION} sh -s - --write-kubeconfig-mode 644

diff --git a/cattle-config-import.yaml b/cattle-config-import.yaml
@@ -39,7 +39,7 @@ eksClusterConfig:
     subnets: []
     tags: {}
     userData: ""
-  region: us-west-1
+  region: ca-central-1
 gkeClusterConfig:
   projectID: <project>
   zone: us-central1-c
@@ -63,7 +63,7 @@ gkeClusterConfig:
       autoRepair: true
       autoUpgrade: true
     maxPodsConstraint: 110
-    version: 1.26.5-gke.2700
+    version: 1.27.4-gke.900
 googleCredentials:
 rancher:
   cleanup: false

diff --git a/cattle-config-provisioning.yaml b/cattle-config-provisioning.yaml
@@ -51,7 +51,7 @@ eksClusterConfig:
   privateAccess: false
   publicAccess: true
   publicAccessSources: []
-  region: ca-central-1
+  region: us-east-2
   secretsEncryption: false
   securityGroups: []
   serviceRole: ""
@@ -73,7 +73,7 @@ gkeClusterConfig:
     servicesSecondaryRangeName: ""
     subnetworkName: ""
     useIpAliases: true
-  kubernetesVersion: 1.26.5-gke.2700
+  kubernetesVersion: 1.27.4-gke.900
   labels:
     owner: hosted-provider-ci
   locations: []
@@ -113,7 +113,7 @@ gkeClusterConfig:
       autoUpgrade: true
     maxPodsConstraint: 110
     name: default-pool
-    version: 1.26.5-gke.2700
+    version: 1.27.4-gke.900
   privateClusterConfig:
     enablePrivateEndpoint: false
     enablePrivateNodes: false

diff --git a/hosted/aks/p0/p0_importing_test.go b/hosted/aks/p0/p0_importing_test.go
@@ -33,13 +33,13 @@ var _ = Describe("P0Importing", func() {
 
 		BeforeEach(func() {
 			var err error
+			err = helper.CreateAKSClusterOnAzure(location, clusterName, k8sVersion, "1")
+			Expect(err).To(BeNil())
 			aksConfig := new(helper.ImportClusterConfig)
 			config.LoadAndUpdateConfig(aks.AKSClusterConfigConfigurationFileKey, aksConfig, func() {
 				aksConfig.ResourceGroup = clusterName
 				aksConfig.ResourceLocation = location
 			})
-			err = helper.CreateAKSClusterOnAzure(location, clusterName, k8sVersion, "1")
-			Expect(err).To(BeNil())
 			cluster, err = helper.ImportAKSHostedCluster(ctx.RancherClient, clusterName, ctx.CloudCred.ID, false, false, false, false, map[string]string{})
 			Expect(err).To(BeNil())
 			cluster, err = helpers.WaitUntilClusterIsReady(cluster, ctx.RancherClient)

diff --git a/hosted/aks/support_matrix/support_matrix_importing_test.go b/hosted/aks/support_matrix/support_matrix_importing_test.go
@@ -32,13 +32,13 @@ var _ = Describe("SupportMatrixImporting", func() {
 			BeforeEach(func() {
 				clusterName = namegen.AppendRandomString("akshostcluster")
 				var err error
+				err = helper.CreateAKSClusterOnAzure(location, clusterName, version, "1")
+				Expect(err).To(BeNil())
 				aksConfig := new(helper.ImportClusterConfig)
 				config.LoadAndUpdateConfig(aks.AKSClusterConfigConfigurationFileKey, aksConfig, func() {
 					aksConfig.ResourceGroup = clusterName
 					aksConfig.ResourceLocation = location
 				})
-				err = helper.CreateAKSClusterOnAzure(location, clusterName, version, "1")
-				Expect(err).To(BeNil())
 				cluster, err = helper.ImportAKSHostedCluster(ctx.RancherClient, clusterName, ctx.CloudCred.ID, false, false, false, false, map[string]string{})
 				Expect(err).To(BeNil())
 				cluster, err = helpers.WaitUntilClusterIsReady(cluster, ctx.RancherClient)

diff --git a/hosted/gke/p0/p0_importing_test.go b/hosted/gke/p0/p0_importing_test.go
@@ -23,7 +23,7 @@ var _ = Describe("P0Importing", func() {
 		ctx         helpers.Context
 		zone        = "us-central1-c"
 		project     = os.Getenv("GKE_PROJECT_ID")
-		k8sVersion  = "1.26.5-gke.2700"
+		k8sVersion  = "1.27.4-gke.900"
 		increaseBy  = 1
 	)
 	var _ = BeforeEach(func() {

diff --git a/hosted/gke/support_matrix/support_matrix_suite_test.go b/hosted/gke/support_matrix/support_matrix_suite_test.go
@@ -1,6 +1,8 @@
 package support_matrix_test
 
 import (
+	"os"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -13,13 +15,14 @@ import (
 var (
 	availableVersionList []string
 	ctx                  helpers.Context
+	project              = os.Getenv("GKE_PROJECT_ID")
 )
 
 func TestSupportMatrix(t *testing.T) {
 	RegisterFailHandler(Fail)
 	ctx = helpers.CommonBeforeSuite("gke")
 	var err error
-	availableVersionList, err = helper.ListSingleVariantGKEAvailableVersions(ctx.RancherClient, "container-project-qa", ctx.CloudCred.ID, "", "us-central1")
+	availableVersionList, err = helper.ListSingleVariantGKEAvailableVersions(ctx.RancherClient, project, ctx.CloudCred.ID, "", "us-central1")
 	Expect(err).To(BeNil())
 	RunSpecs(t, "SupportMatrix Suite")
 }