C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use short cluster_name for TF CI (#4835)

Browse source
This commit is contained in:
Maxime Guyot 2019-06-04 14:25:00 +03:00 committed by Kubernetes Prow Robot
parent 956afcb33f
commit 4f05d801c3
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci/terraform.yml
View file

@ -36,6 +36,7 @@
ANSIBLE_INVENTORY: hosts ANSIBLE_INVENTORY: hosts
CI_PLATFORM: tf CI_PLATFORM: tf
TF_VAR_ssh_user: $SSH_USER TF_VAR_ssh_user: $SSH_USER
TF_VAR_cluster_name: $CI_JOB_ID
script: script:
- tests/scripts/testcases_run.sh - tests/scripts/testcases_run.sh
after_script: after_script:
@ -69,7 +70,6 @@ tf-packet-ubuntu16-default:
TF_VERSION: 0.11.11 TF_VERSION: 0.11.11
PROVIDER: packet PROVIDER: packet
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG
TF_VAR_number_of_k8s_masters: "1" TF_VAR_number_of_k8s_masters: "1"
TF_VAR_number_of_k8s_nodes: "1" TF_VAR_number_of_k8s_nodes: "1"
TF_VAR_plan_k8s_masters: t1.small.x86 TF_VAR_plan_k8s_masters: t1.small.x86
@ -84,7 +84,6 @@ tf-packet-ubuntu18-default:
TF_VERSION: 0.11.11 TF_VERSION: 0.11.11
PROVIDER: packet PROVIDER: packet
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG
TF_VAR_number_of_k8s_masters: "1" TF_VAR_number_of_k8s_masters: "1"
TF_VAR_number_of_k8s_nodes: "1" TF_VAR_number_of_k8s_nodes: "1"
TF_VAR_plan_k8s_masters: t1.small.x86 TF_VAR_plan_k8s_masters: t1.small.x86
@ -114,7 +113,6 @@ tf-ovh_ubuntu18-calico:
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60" ANSIBLE_TIMEOUT: "60"
SSH_USER: ubuntu SSH_USER: ubuntu
TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG-$CI_JOB_ID
TF_VAR_number_of_k8s_masters: "0" TF_VAR_number_of_k8s_masters: "0"
TF_VAR_number_of_k8s_masters_no_floating_ip: "1" TF_VAR_number_of_k8s_masters_no_floating_ip: "1"
TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0" TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"
@ -143,7 +141,6 @@ tf-ovh_coreos-calico:
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60" ANSIBLE_TIMEOUT: "60"
SSH_USER: core SSH_USER: core
TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG-$CI_JOB_ID
TF_VAR_number_of_k8s_masters: "0" TF_VAR_number_of_k8s_masters: "0"
TF_VAR_number_of_k8s_masters_no_floating_ip: "1" TF_VAR_number_of_k8s_masters_no_floating_ip: "1"
TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0" TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"