From 3a1027f6043ba76baaf24f26e221fc8e77fdcd9c Mon Sep 17 00:00:00 2001
From: Brad Beam <brad.beam@b-rad.info>
Date: Mon, 6 Mar 2017 11:01:33 -0600
Subject: [PATCH] Adding test for unset cloud provider

---
 .gitlab-ci.yml | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e41f5da37..6a488b9c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,7 @@ before_script:
   SSH_USER: $GCE_USER
   TEST_ID: "$CI_PIPELINE_ID-$CI_BUILD_ID"
   CONTAINER_ENGINE: docker
+  CLOUD_PROVIDER: "-e CLOUD_PROVIDER=gce"
   PRIVATE_KEY: $GCE_PRIVATE_KEY
   GS_ACCESS_KEY_ID: $GS_KEY
   GS_SECRET_ACCESS_KEY: $GS_SECRET
@@ -114,7 +115,7 @@ before_script:
       -e ansible_ssh_user=${SSH_USER} 
       -e bootstrap_os=${BOOTSTRAP_OS}
       -e cert_management=${CERT_MGMT:-script}
-      -e cloud_provider=gce
+      ${CLOUD_PROVIDER}
       -e deploy_netchecker=true
       -e download_localhost=true
       -e download_run_once=true
@@ -140,7 +141,7 @@ before_script:
       -e ansible_python_interpreter=${PYPATH} 
       -e ansible_ssh_user=${SSH_USER} 
       -e bootstrap_os=${BOOTSTRAP_OS} 
-      -e cloud_provider=gce 
+      ${CLOUD_PROVIDER}
       -e deploy_netchecker=true 
       -e download_localhost=true 
       -e download_run_once=true 
@@ -169,7 +170,7 @@ before_script:
     - >
       if [ "${IDEMPOT_CHECK}" = "true" ]; then
       ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS 
-      -b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} 
+      -b --become-user=root ${CLOUD_PROVIDER} $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} 
       --private-key=${HOME}/.ssh/id_rsa 
       -e bootstrap_os=${BOOTSTRAP_OS} 
       -e ansible_python_interpreter=${PYPATH} 
@@ -197,7 +198,7 @@ before_script:
     - >
       if [ "${IDEMPOT_CHECK}" = "true" ]; then
       ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS 
-      -b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} 
+      -b --become-user=root ${CLOUD_PROVIDER} $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} 
       --private-key=${HOME}/.ssh/id_rsa 
       -e bootstrap_os=${BOOTSTRAP_OS} 
       -e ansible_python_interpreter=${PYPATH} 
@@ -210,7 +211,7 @@ before_script:
     - >
       if [ "${IDEMPOT_CHECK}" = "true" ]; then
       ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS 
-      -b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} 
+      -b --become-user=root ${CLOUD_PROVIDER} $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} 
       --private-key=${HOME}/.ssh/id_rsa 
       -e bootstrap_os=${BOOTSTRAP_OS} 
       -e ansible_python_interpreter=${PYPATH} 
@@ -346,6 +347,13 @@ before_script:
   CLOUD_REGION: us-central1-b
   CLUSTER_MODE: separate
 
+.ubuntu_no_cloud_sep_variables: &ubuntu_no_cloud_sep_variables
+# stage: deploy-gce-part1
+  CLOUD_IMAGE: ubuntu-1604-xenial
+  CLOUD_REGION: us-central1-b
+  CLUSTER_MODE: separate
+  CLOUD_PROVIDER: ""
+
 # Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
 coreos-calico-sep:
   stage: deploy-gce-part1
@@ -571,6 +579,17 @@ ubuntu-vault-sep:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
+ubuntu-no-cloud-sep:
+  stage: deploy-gce-part1
+  <<: *job
+  <<: *gce
+  variables:
+    <<: *gce_variables
+    <<: *ubuntu_no_cloud_sep_variables
+  when: manual
+  except: ['triggers']
+  only: ['master', /^pr-.*$/]
+
 # Premoderated with manual actions
 ci-authorized:
   <<: *job