Move CI vars out of gitlab and into var files (#1808)

tests/cloud_playbooks/create-gce.yml

@@ -6,7 +6,11 @@
     cloud_machine_type: g1-small
     mode: default
     preemptible: no
+    ci_job_name: "{{ lookup('env', 'CI_JOB_NAME') }}"
   tasks:
+    - name: include vars for test {{ ci_test_name }}
+      include_vars: "../files/{{ ci_job_name }}.yml"
+
     - name: replace_test_id
       set_fact:
         test_name: "{{test_id |regex_replace('\\.', '-')}}"
@@ -32,7 +36,7 @@
         credentials_file: "{{gce_credentials_file | default(omit)}}"
         project_id: "{{ gce_project_id }}"
         zone: "{{cloud_region}}"
-        metadata: '{"test_id": "{{test_id}}", "network": "{{kube_network_plugin}}", "startup-script": "{{startup_script}}"}'
+        metadata: '{"test_id": "{{test_id}}", "network": "{{kube_network_plugin}}", "startup-script": "{{startup_script|default("")}}"}'
         tags: "build-{{test_name}},{{kube_network_plugin}}"
         ip_forward: yes
         service_account_permissions: ['compute-rw']
@@ -59,7 +63,6 @@
         dest: "{{ inventory_path|dirname }}/group_vars/fake_hosts.yml"
       when: mode in ['scale', 'separate-scale', 'ha-scale']
 
-
 - name: Wait for instances
   hosts: "waitfor_hosts"
   gather_facts: false

tests/files/centos-weave-kubeadm.yml

@@ -0,0 +1,15 @@
+# Instance settings
+cloud_image: centos-7
+cloud_machine_type: "n1-standard-1"
+cloud_region: us-central1-b
+mode: ha
+startup_script: ""
+
+# Deployment settings
+kube_network_plugin: weave
+weave_cpu_limit: "100m"
+weave_cpu_requests: "100m"
+kubeadm_enabled: "true"
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/centos7-calico-ha.yml

@@ -0,0 +1,12 @@
+# Instance settings
+cloud_image: centos-7
+cloud_region: europe-west1-b
+mode: ha-scale
+
+# Deployment settings
+kube_network_plugin: calico
+download_localhost: "true"
+download_run_once: "true"
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/centos7-flannel-addons.yml

@@ -0,0 +1,14 @@
+# Instance settings
+cloud_image: centos-7
+cloud_region: us-west1-a
+cloud_machine_type: "n1-standard-1"
+mode: default
+
+# Deployment settings
+kube_network_plugin: flannel
+helm_enabled: true
+istio_enabled: true
+efk_enabled: true
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/coreos-alpha-weave-ha.yml

@@ -0,0 +1,15 @@
+# Instance settings
+cloud_image: coreos-alpha
+cloud_region: us-west1-a
+mode: ha-scale
+startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd'
+
+# Deployment settings
+kube_network_plugin: weave
+weave_cpu_limit: "100m"
+weave_cpu_requests: "100m"
+bootstrap_os: coreos
+resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/coreos-calico-aio.yml

@@ -0,0 +1,15 @@
+# Instance settings
+cloud_image: coreos-stable
+cloud_region: us-west1-b
+cloud_machine_type: "n1-standard-2"
+mode: aio
+##user-data to simply turn off coreos upgrades
+startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd'
+
+# Deployment settings
+bootstrap_os: coreos
+kube_network_plugin: calico
+resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/coreos-canal.yml

@@ -0,0 +1,13 @@
+# Instance settings
+cloud_image: coreos-stable
+cloud_region: us-east1-b
+mode: default
+startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd'
+
+# Deployment settings
+kube_network_plugin: canal
+bootstrap_os: coreos
+resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/debian8-calico.yml

@@ -0,0 +1,11 @@
+# Instance settings
+cloud_image: debian-8-kubespray
+cloud_region: us-central1-b
+mode: default
+
+# Deployment settings
+kube_network_plugin: calico
+bootstrap_os: debian
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/rhel7-canal-sep.yml

@@ -0,0 +1,10 @@
+# Instance settings
+cloud_image: rhel-7
+cloud_region: us-east1-b
+mode: separate
+
+# Deployment settings
+kube_network_plugin: canal
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/rhel7-weave.yml

@@ -0,0 +1,12 @@
+# Instance settings
+cloud_image: rhel-7
+cloud_region: europe-west1-b
+mode: default
+
+# Deployment settings
+kube_network_plugin: weave
+weave_cpu_limit: "100m"
+weave_cpu_requests: "100m"
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/ubuntu-canal-ha.yml

@@ -0,0 +1,11 @@
+# Instance settings
+cloud_image: ubuntu-1604-lts
+cloud_region: europe-west1-b
+mode: ha
+
+# Deployment settings
+bootstrap_os: ubuntu
+kube_network_plugin: canal
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/ubuntu-canal-kubeadm.yml

@@ -0,0 +1,13 @@
+# Instance settings
+cloud_image:  ubuntu-1604-lts
+cloud_machine_type: "n1-standard-1"
+cloud_region: europe-west1-b
+mode: ha
+
+# Deployment settings
+bootstrap_os: ubuntu
+kube_network_plugin: canal
+kubeadm_enabled: "true"
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/ubuntu-flannel.yml

@@ -0,0 +1,11 @@
+# Instance settings
+cloud_image: ubuntu-1604-lts
+cloud_region: europe-west1-b
+mode: separate
+
+# Deployment settings
+bootstrap_os: ubuntu
+kube_network_plugin: flannel
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/ubuntu-rkt-sep.yml

@@ -0,0 +1,13 @@
+# Instance settings
+cloud_image: ubuntu-1604-lts
+cloud_region: us-central1-b
+mode: separate
+
+# Deployment settings
+bootstrap_os: ubuntu
+kube_network_plugin: flannel
+etcd_deployment: rkt
+kubelet_deployment: rkt
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/ubuntu-vault-sep.yml

@@ -0,0 +1,13 @@
+# Instance settings
+cloud_machine_type: "n1-standard-1"
+cloud_image: ubuntu-1604-lts
+cloud_region: us-central1-b
+mode: separate
+
+# Instance settings
+bootstrap_os: ubuntu
+cert_mgmt: vault
+kube_network_plugin: canal
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/files/ubuntu-weave-sep.yml

@@ -0,0 +1,13 @@
+# Instance settings
+cloud_image: ubuntu-1604-lts
+cloud_region: us-central1-b
+mode: separate
+
+# Deployment settings
+bootstrap_os: ubuntu
+kube_network_plugin: weave
+weave_cpu_limit: "100m"
+weave_cpu_requests: "100m"
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce

tests/templates/inventory-gce.j2

@@ -74,4 +74,3 @@ fake_scale_host[1:200]
 [kube-node:children]
 fake_hosts
 {% endif %}
-