diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6aae01ac..fa5214209 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,8 +31,8 @@ variables: ANSIBLE_LOG_LEVEL: "-vv" RECOVER_CONTROL_PLANE_TEST: "false" RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube_control_plane[1:]" - TERRAFORM_14_VERSION: 0.14.10 - TERRAFORM_13_VERSION: 0.13.6 + TERRAFORM_14_VERSION: 0.14.11 + TERRAFORM_15_VERSION: 0.15.5 before_script: - ./tests/scripts/rebase.sh diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml index 82e39c0de..7196a7d62 100644 --- a/.gitlab-ci/terraform.yml +++ b/.gitlab-ci/terraform.yml @@ -12,7 +12,7 @@ # Prepare inventory - cp contrib/terraform/$PROVIDER/sample-inventory/cluster.tfvars . - ln -s contrib/terraform/$PROVIDER/hosts - - terraform init contrib/terraform/$PROVIDER + - terraform -chdir="contrib/terraform/$PROVIDER" init # Copy SSH keypair - mkdir -p ~/.ssh - echo "$PACKET_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa @@ -28,8 +28,8 @@ tags: [light] only: ['master', /^pr-.*$/] script: - - terraform validate -var-file=cluster.tfvars contrib/terraform/$PROVIDER - - terraform fmt -check -diff contrib/terraform/$PROVIDER + - terraform -chdir="contrib/terraform/$PROVIDER" validate + - terraform -chdir="contrib/terraform/$PROVIDER" fmt -check -diff .terraform_apply: extends: .terraform_install @@ -53,44 +53,44 @@ # Cleanup regardless of exit code - chronic ./tests/scripts/testcases_cleanup.sh -tf-0.13.x-validate-openstack: +tf-0.15.x-validate-openstack: extends: .terraform_validate variables: - TF_VERSION: $TERRAFORM_13_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: openstack CLUSTER: $CI_COMMIT_REF_NAME -tf-0.13.x-validate-packet: +tf-0.15.x-validate-packet: extends: .terraform_validate variables: - TF_VERSION: $TERRAFORM_13_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: packet CLUSTER: $CI_COMMIT_REF_NAME -tf-0.13.x-validate-aws: +tf-0.15.x-validate-aws: extends: .terraform_validate variables: - TF_VERSION: $TERRAFORM_13_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: aws CLUSTER: $CI_COMMIT_REF_NAME -tf-0.13.x-validate-exoscale: +tf-0.15.x-validate-exoscale: extends: .terraform_validate variables: - TF_VERSION: $TERRAFORM_13_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: exoscale -tf-0.13.x-validate-vsphere: +tf-0.15.x-validate-vsphere: extends: .terraform_validate variables: - TF_VERSION: $TERRAFORM_13_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: vsphere CLUSTER: $CI_COMMIT_REF_NAME -tf-0.13.x-validate-upcloud: +tf-0.15.x-validate-upcloud: extends: .terraform_validate variables: - TF_VERSION: $TERRAFORM_13_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: upcloud CLUSTER: $CI_COMMIT_REF_NAME @@ -210,7 +210,7 @@ tf-elastx_ubuntu18-calico: allow_failure: true variables: <<: *elastx_variables - TF_VERSION: $TERRAFORM_14_VERSION + TF_VERSION: $TERRAFORM_15_VERSION PROVIDER: openstack CLUSTER: $CI_COMMIT_REF_NAME ANSIBLE_TIMEOUT: "60"