diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cd419951..49cc12dcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,6 +103,7 @@ before_script: -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} -e mode=${CLUSTER_MODE} -e test_id=${TEST_ID} + -e startup_script=${STARTUP_SCRIPT} # Check out latest tag if testing upgrade # Uncomment when gitlab kargo repo has tags @@ -261,6 +262,8 @@ before_script: CLUSTER_MODE: separate BOOTSTRAP_OS: coreos RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12 + ##User-data to simply turn off coreos upgrades + STARTUP_SCRIPT: "systemctl stop locksmithd && systemctl disable locksmithd" .ubuntu_canal_ha_variables: &ubuntu_canal_ha_variables # stage: deploy-gce-part1 @@ -271,6 +274,7 @@ before_script: UPGRADE_TEST: "basic" CLUSTER_MODE: ha UPGRADE_TEST: "graceful" + STARTUP_SCRIPT: "" .rhel7_weave_variables: &rhel7_weave_variables # stage: deploy-gce-part1 @@ -278,6 +282,7 @@ before_script: CLOUD_IMAGE: rhel-7 CLOUD_REGION: europe-west1-b CLUSTER_MODE: default + STARTUP_SCRIPT: "" .centos7_flannel_variables: ¢os7_flannel_variables # stage: deploy-gce-part2 @@ -285,13 +290,15 @@ before_script: CLOUD_IMAGE: centos-7 CLOUD_REGION: us-west1-a CLUSTER_MODE: default - + STARTUP_SCRIPT: "" + .debian8_calico_variables: &debian8_calico_variables # stage: deploy-gce-part2 KUBE_NETWORK_PLUGIN: calico CLOUD_IMAGE: debian-8-kubespray CLOUD_REGION: us-central1-b CLUSTER_MODE: default + STARTUP_SCRIPT: "" .coreos_canal_variables: &coreos_canal_variables # stage: deploy-gce-part2 @@ -302,6 +309,7 @@ before_script: BOOTSTRAP_OS: coreos IDEMPOT_CHECK: "true" RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12 + STARTUP_SCRIPT: "systemctl stop locksmithd && systemctl disable locksmithd" .rhel7_canal_sep_variables: &rhel7_canal_sep_variables # stage: deploy-gce-special @@ -309,6 +317,7 @@ before_script: CLOUD_IMAGE: rhel-7 CLOUD_REGION: us-east1-b CLUSTER_MODE: separate + STARTUP_SCRIPT: "" .ubuntu_weave_sep_variables: &ubuntu_weave_sep_variables # stage: deploy-gce-special @@ -317,6 +326,7 @@ before_script: CLOUD_REGION: us-central1-b CLUSTER_MODE: separate IDEMPOT_CHECK: "false" + STARTUP_SCRIPT: "" .centos7_calico_ha_variables: ¢os7_calico_ha_variables # stage: deploy-gce-special @@ -327,6 +337,7 @@ before_script: CLOUD_REGION: europe-west1-b CLUSTER_MODE: ha-scale IDEMPOT_CHECK: "true" + STARTUP_SCRIPT: "" .coreos_alpha_weave_ha_variables: &coreos_alpha_weave_ha_variables # stage: deploy-gce-special @@ -336,6 +347,7 @@ before_script: CLUSTER_MODE: ha-scale BOOTSTRAP_OS: coreos RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12 + STARTUP_SCRIPT: "systemctl stop locksmithd && systemctl disable locksmithd" .ubuntu_rkt_sep_variables: &ubuntu_rkt_sep_variables # stage: deploy-gce-part1 @@ -345,6 +357,7 @@ before_script: CLUSTER_MODE: separate ETCD_DEPLOYMENT: rkt KUBELET_DEPLOYMENT: rkt + STARTUP_SCRIPT: "" .ubuntu_vault_sep_variables: &ubuntu_vault_sep_variables # stage: deploy-gce-part1 @@ -353,6 +366,7 @@ before_script: CLOUD_IMAGE: ubuntu-1604-xenial CLOUD_REGION: us-central1-b CLUSTER_MODE: separate + STARTUP_SCRIPT: "" # Builds for PRs only (premoderated by unit-tests step) and triggers (auto) coreos-calico-sep: diff --git a/tests/cloud_playbooks/create-gce.yml b/tests/cloud_playbooks/create-gce.yml index d1e7c011e..37035a6fe 100644 --- a/tests/cloud_playbooks/create-gce.yml +++ b/tests/cloud_playbooks/create-gce.yml @@ -30,7 +30,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}}"}' + metadata: '{"test_id": "{{test_id}}", "network": "{{kube_network_plugin}}", "startup-script": "{{startup_script}}"}' tags: "build-{{test_name}},{{kube_network_plugin}}" register: gce