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

test coreos canal

Browse source
This commit is contained in:
Matthew Mosesohn 2017-10-04 07:54:55 +01:00
parent 9c86da1403
commit 9897ca2fee
3 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
.gitlab-ci.yml
View file

@ -262,18 +262,18 @@ before_script:
tests/testcases/040_check-network-adv.yml $LOG_LEVEL; tests/testcases/040_check-network-adv.yml $LOG_LEVEL;
fi fi
after_script: # after_script:
- > # - >
ansible-playbook -i inventory/inventory.ini tests/cloud_playbooks/delete-gce.yml -c local $LOG_LEVEL # ansible-playbook -i inventory/inventory.ini tests/cloud_playbooks/delete-gce.yml -c local $LOG_LEVEL
-e mode=${CLUSTER_MODE} # -e mode=${CLUSTER_MODE}
-e test_id=${TEST_ID} # -e test_id=${TEST_ID}
-e kube_network_plugin=${KUBE_NETWORK_PLUGIN} # -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-e gce_project_id=${GCE_PROJECT_ID} # -e gce_project_id=${GCE_PROJECT_ID}
-e gce_service_account_email=${GCE_ACCOUNT} # -e gce_service_account_email=${GCE_ACCOUNT}
-e gce_credentials_file=${HOME}/.ssh/gce.json # -e gce_credentials_file=${HOME}/.ssh/gce.json
-e cloud_image=${CLOUD_IMAGE} # -e cloud_image=${CLOUD_IMAGE}
-e inventory_path=${PWD}/inventory/inventory.ini # -e inventory_path=${PWD}/inventory/inventory.ini
-e cloud_region=${CLOUD_REGION} # -e cloud_region=${CLOUD_REGION}
# Test matrix. Leave the comments for markup scripts. # Test matrix. Leave the comments for markup scripts.
.coreos_calico_aio_variables: &coreos_calico_aio_variables .coreos_calico_aio_variables: &coreos_calico_aio_variables
@ -349,13 +349,12 @@ before_script:
STARTUP_SCRIPT: "" STARTUP_SCRIPT: ""
.coreos_canal_variables: &coreos_canal_variables .coreos_canal_variables: &coreos_canal_variables
# stage: deploy-gce-part2 # stage: deploy-gce-part1
KUBE_NETWORK_PLUGIN: canal KUBE_NETWORK_PLUGIN: canal
CLOUD_IMAGE: coreos-stable-1465-6-0-v20170817 CLOUD_IMAGE: coreos-stable-1465-6-0-v20170817
CLOUD_REGION: us-east1-b CLOUD_REGION: us-east1-b
CLUSTER_MODE: default CLUSTER_MODE: default
BOOTSTRAP_OS: coreos BOOTSTRAP_OS: coreos
IDEMPOT_CHECK: "true"
RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12 RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12
STARTUP_SCRIPT: 'systemctl disable locksmithd && systemctl stop locksmithd' STARTUP_SCRIPT: 'systemctl disable locksmithd && systemctl stop locksmithd'
@ -434,8 +433,8 @@ coreos-calico-aio:
<<: *gce <<: *gce
variables: variables:
<<: *gce_variables <<: *gce_variables
<<: *coreos_calico_aio_variables <<: *coreos_calico_sep_variables
when: on_success when: manual
except: ['triggers'] except: ['triggers']
only: [/^pr-.*$/] only: [/^pr-.*$/]
@ -445,8 +444,8 @@ coreos-calico-sep-triggers:
<<: *gce <<: *gce
variables: variables:
<<: *gce_variables <<: *gce_variables
<<: *coreos_calico_aio_variables <<: *coreos_calico_sep_variables
when: on_success when: manual
only: ['triggers'] only: ['triggers']
centos7-flannel: centos7-flannel:
@ -598,15 +597,15 @@ debian8-calico-triggers:
only: ['triggers'] only: ['triggers']
coreos-canal: coreos-canal:
stage: deploy-gce-part2 stage: deploy-gce-part1
<<: *job <<: *job
<<: *gce <<: *gce
variables: variables:
<<: *gce_variables <<: *gce_variables
<<: *coreos_canal_variables <<: *coreos_canal_variables
when: manual when: on_success
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: [/^pr-.*$/]
coreos-canal-triggers: coreos-canal-triggers:
stage: deploy-gce-part1 stage: deploy-gce-part1

1
ansible.cfg
View file

@ -1,4 +1,5 @@
[ssh_connection] [ssh_connection]
pipelining=True pipelining=True
ssh_args = -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100 ssh_args = -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100
#ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100 #ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m -o ConnectionAttempts=100

5
roles/bootstrap-os/tasks/bootstrap-coreos.yml
View file

@ -21,9 +21,8 @@
failed_when: false failed_when: false
changed_when: false changed_when: false
check_mode: no check_mode: no
when: need_bootstrap.rc != 0 when: (need_bootstrap | failed)
tags: tags: facts
- facts
- name: Bootstrap | Copy get-pip.py - name: Bootstrap | Copy get-pip.py
copy: copy: