Merge pull request #352 from sighupio/fix/e2e-tests

fix/e2e tests
sighupio · Apr 13, 2023 · e847a7d · e847a7d
2 parents 2f3718e + 9bc2f81
commit e847a7d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/automated-tests/e2e-tests/aws-eks/bootstrap.tpl.yml b/automated-tests/e2e-tests/aws-eks/bootstrap.tpl.yml
@@ -7,11 +7,11 @@ metadata:
   name: e2e-${CI_BUILD_NUMBER}
 spec:
   networkCIDR: 10.0.0.0/16
-  publicSubnetsCIDRs:  
+  publicSubnetsCIDRs:
     - 10.0.20.0/24
     - 10.0.30.0/24
     - 10.0.40.0/24
-  privateSubnetsCIDRs: 
+  privateSubnetsCIDRs:
     - 10.0.182.0/24
     - 10.0.172.0/24
     - 10.0.162.0/24
@@ -26,4 +26,4 @@ executor:
     config:
       bucket: ${TERRAFORM_TF_STATES_BUCKET_NAME}
       key: ${CI_REPO}/${DRONE_BRANCH}/${CI_BUILD_NUMBER}/bootstrap/aws.state
-      region: ${AWS_DEFAULT_REGION}
+      region: ${AWS_REGION}
diff --git a/automated-tests/e2e-tests/aws-eks/cluster.tpl.yml b/automated-tests/e2e-tests/aws-eks/cluster.tpl.yml
@@ -6,7 +6,7 @@ kind: Cluster
 metadata:
   name: e2e-${CI_BUILD_NUMBER}
 spec:
-  version: "1.20"
+  version: "1.25"
   network: ${NETWORK_ID}
   subnetworks: ${PRIVATE_SUBNETS}
   dmzCIDRRange: ${NETWORK_CIDR}
@@ -39,4 +39,4 @@ executor:
     config:
       bucket: ${TERRAFORM_TF_STATES_BUCKET_NAME}
       key: ${CI_REPO}/${DRONE_BRANCH}/${CI_BUILD_NUMBER}/cluster/eks.state
-      region: ${AWS_DEFAULT_REGION}
+      region: ${AWS_REGION}
diff --git a/automated-tests/e2e-tests/gcp-gke/bootstrap.tpl.yml b/automated-tests/e2e-tests/gcp-gke/bootstrap.tpl.yml
@@ -27,4 +27,4 @@ executor:
     config:
       bucket: ${TERRAFORM_TF_STATES_BUCKET_NAME}
       key: ${CI_REPO}/${DRONE_BRANCH}/${CI_BUILD_NUMBER}/bootstrap/gcp.state
-      region: ${AWS_DEFAULT_REGION}
+      region: ${AWS_REGION}
diff --git a/automated-tests/e2e-tests/gcp-gke/cluster.tpl.yml b/automated-tests/e2e-tests/gcp-gke/cluster.tpl.yml
@@ -6,6 +6,8 @@ kind: Cluster
 metadata:
   name: e2e-${CI_BUILD_NUMBER}
 spec:
+  region: ${GOOGLE_REGION}
+  project: ${GOOGLE_PROJECT}
   version: 1.25
   network: e2e-${CI_BUILD_NUMBER}
   subnetworks:
@@ -43,4 +45,4 @@ executor:
     config:
       bucket: ${TERRAFORM_TF_STATES_BUCKET_NAME}
       key: ${CI_REPO}/${DRONE_BRANCH}/${CI_BUILD_NUMBER}/cluster/gke.state
-      region: ${AWS_DEFAULT_REGION}
+      region: ${AWS_REGION}
diff --git a/automated-tests/e2e-tests/vsphere/cluster.tpl.yml b/automated-tests/e2e-tests/vsphere/cluster.tpl.yml
@@ -50,4 +50,4 @@ executor:
     config:
       bucket: ${TERRAFORM_TF_STATES_BUCKET_NAME}
       key: ${CI_REPO}/${DRONE_BRANCH}/${CI_BUILD_NUMBER}/cluster/vsphere.state
-      region: ${AWS_DEFAULT_REGION}
+      region: ${AWS_REGION}
diff --git a/automated-tests/e2e-tests/vsphere/tests.sh b/automated-tests/e2e-tests/vsphere/tests.sh
@@ -82,6 +82,8 @@ CPUARCH="amd64_v1"
         echo "$output" >&3
         echo "  TERRAFORM LOGS:" >&3
         cat ./automated-tests/e2e-tests/vsphere/cluster/logs/terraform.logs >&3
+        echo "  ANSIBLE LOGS:" >&3
+        cat ./automated-tests/e2e-tests/vsphere/cluster/logs/ansible.log >&3
     fi
     [ "$status" -eq 0 ]
 }
@@ -99,6 +101,8 @@ CPUARCH="amd64_v1"
         echo "$output" >&3
         echo "  TERRAFORM LOGS:" >&3
         cat ./automated-tests/e2e-tests/vsphere/cluster/logs/terraform.logs >&3
+        echo "  ANSIBLE LOGS:" >&3
+        cat ./automated-tests/e2e-tests/vsphere/cluster/logs/ansible.log >&3
     fi
     [ "$status" -eq 0 ]
 }

diff --git a/data/provisioners/cluster/vsphere/main.tf b/data/provisioners/cluster/vsphere/main.tf
@@ -44,7 +44,7 @@ locals {
 }
 
 module "fury" {
-  source = "https://github.com/sighupio/furyctl-provisioners/archive/refs/tags/v0.5.0.zip//furyctl-provisioners-0.5.0/modules/cluster/vsphere"
+  source = "https://github.com/sighupio/furyctl-provisioners/archive/refs/tags/v0.6.3.zip//furyctl-provisioners-0.6.3/modules/cluster/vsphere"
 
   name                        = var.name
   kube_version                = var.kube_version

diff --git a/internal/cluster/provisioners/vsphere/provisioner.go b/internal/cluster/provisioners/vsphere/provisioner.go
@@ -337,7 +337,7 @@ func downloadAnsibleRoles(workingDirectory string) error {
 	}
 
 	client := &getter.Client{
-		Src:  "https://github.com/sighupio/furyctl-provisioners/archive/refs/tags/v0.5.0.zip//furyctl-provisioners-0.5.0/roles",
+		Src:  "https://github.com/sighupio/furyctl-provisioners/archive/refs/tags/v0.6.3.zip//furyctl-provisioners-0.6.3/roles",
 		Dst:  downloadPath,
 		Pwd:  workingDirectory,
 		Mode: getter.ClientModeAny,