Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Terraform 0.15, remove 0.13, update 0.14 and add retry to packet PR #7927

Merged
merged 2 commits into from
Aug 31, 2021
Merged

Add Terraform 0.15, remove 0.13, update 0.14 and add retry to packet PR #7927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761159d
Add one retry to packet_pr jobs
floryut Aug 31, 2021
d0c93ba
Update Terraform 0.14 to .11, remove 0.13 jobs and add 0.15
floryut Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitlab-ci/packet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# CI template for PRs
.packet_pr:
only: [/^pr-.*$/]
retry: 1
extends: .packet

# CI template for periodic CI jobs
Expand Down
32 changes: 16 additions & 16 deletions .gitlab-ci/terraform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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"
Expand Down