External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-04 18:21:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Antoine Legrand
2018-02-12 14:28:59 +01:00
parent e1d139db2e
commit cb202a76df
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -24,7 +24,7 @@ variables:
RESET_CHECK: "false" RESET_CHECK: "false"
UPGRADE_TEST: "false" UPGRADE_TEST: "false"
KUBEADM_ENABLED: "false" KUBEADM_ENABLED: "false"
LOG_LEVEL: "-vv" LOG_LEVEL: "-vvv"
# asia-east1-a # asia-east1-a
# asia-northeast1-a # asia-northeast1-a
@@ -484,8 +484,8 @@ coreos-calico-aio:
<<: *job <<: *job
<<: *gce <<: *gce
variables: variables:
<<: *gce_variables
<<: *coreos_calico_aio_variables <<: *coreos_calico_aio_variables
<<: *gce_variables
when: on_success when: on_success
except: ['triggers'] except: ['triggers']
# only: [/^pr-.*$/] # only: [/^pr-.*$/]
@@ -495,7 +495,7 @@ ubuntu-canal-ha-do:
<<: *job <<: *job
<<: *do <<: *do
variables: variables:
<<: *gce_variables <<: *do_variables
when: on_success when: on_success
except: ['triggers'] except: ['triggers']
# only: [/^pr-.*$/] # only: [/^pr-.*$/]

16
tests/Makefile
View File

@@ -5,17 +5,16 @@ $(HOME)/.ssh/id_rsa:
init-gce: $(HOME)/.ssh/id_rsa init-gce: $(HOME)/.ssh/id_rsa
# echo $(GCE_PEM_FILE) | base64 -d > $(HOME)/.ssh/gce # echo $(GCE_PEM_FILE) | base64 -d > $(HOME)/.ssh/gce
echo "$(GCE_CREDENTIALS)" > $(HOME)/.ssh/gce.json echo "$(GCE_CREDENTIALS_B64)" > $(HOME)/.ssh/gce.json
init-do: $(HOME)/.ssh/id_rsa init-do: $(HOME)/.ssh/id_rsa
pip install dopy pip install dopy==0.3.5
echo $(DO_PRIVATE_KEY) | base64 -d > $(HOME)/.ssh/id_rsa echo $(DO_PRIVATE_KEY) | base64 -d > $(HOME)/.ssh/id_rsa
create-gce: init-gce create-gce: init-gce
ansible-playbook cloud_playbooks/create-gce.yml -i local_inventory/hosts.cfg -c local \ ansible-playbook cloud_playbooks/create-gce.yml -i local_inventory/hosts.cfg -c local \
$(LOG_LEVEL) \ $(LOG_LEVEL) \
-e @$(CI_TEST_VARS) \ -e @"files/${CI_JOB_NAME}.yml" \
-e gce_credentials_file=$(HOME)/.ssh/gce.json \ -e gce_credentials_file=$(HOME)/.ssh/gce.json \
-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) \
@@ -27,7 +26,7 @@ create-gce: init-gce
delete-gce: delete-gce:
ansible-playbook -i ../inventory/sample/hosts.ini cloud_playbooks/delete-gce.yml -c local \ ansible-playbook -i ../inventory/sample/hosts.ini cloud_playbooks/delete-gce.yml -c local \
$(LOG_LEVEL) \ $(LOG_LEVEL) \
-e @$(CI_TEST_VARS) \ -e @"files/${CI_JOB_NAME}.yml" \
-e test_id=$(TEST_ID) \ -e test_id=$(TEST_ID) \
-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) \
@@ -35,16 +34,17 @@ delete-gce:
-e inventory_path=$(PWD)/inventory/sample/hosts.ini -e inventory_path=$(PWD)/inventory/sample/hosts.ini
create-do: init-do create-do: init-do
ansible-playbook cloud_playbooks/create-do.yml -i tests/local_inventory/hosts.cfg -c local \ ansible-playbook cloud_playbooks/create-do.yml -i local_inventory/hosts.cfg -c local \
${LOG_LEVEL} \ ${LOG_LEVEL} \
-e @$(CI_TEST_VARS) \ -e @"files/${CI_JOB_NAME}.yml" \
-e inventory_path=${PWD}/../inventory/hosts.ini \ -e inventory_path=${PWD}/../inventory/hosts.ini \
-e test_id=${TEST_ID} -e test_id=${TEST_ID}
delete-do: delete-do:
ansible-playbook -i ../inventory/sample/hosts.ini tests/cloud_playbooks/create-do.yml -c local \ ansible-playbook -i ../inventory/sample/hosts.ini cloud_playbooks/create-do.yml -c local \
$LOG_LEVEL \ $LOG_LEVEL \
-e @"files/${CI_JOB_NAME}.yml" \
-e state=absent \ -e state=absent \
-e test_id=${TEST_ID} \ -e test_id=${TEST_ID} \
-e inventory_path=${PWD}/../inventory/inventory.ini \ -e inventory_path=${PWD}/../inventory/inventory.ini \

3
tests/cloud_playbooks/create-do.yml
View File

@@ -54,6 +54,9 @@
set_fact: set_fact:
test_name: "{{test_id |regex_replace('\\.', '-')}}" test_name: "{{test_id |regex_replace('\\.', '-')}}"
- name: show vars
debug: msg="{{cloud_region}}, {{cloud_image}}"
- set_fact: - set_fact:
instance_names: >- instance_names: >-
{%- if mode in ['separate', 'ha'] -%} {%- if mode in ['separate', 'ha'] -%}

2
tests/files/ubuntu-canal-ha-do.yml
View File

@@ -1,5 +1,5 @@
cloud_image: ubuntu-16-04-x64 cloud_image: ubuntu-16-04-x64
cloud_region: NYC3 cloud_region: nyc3
mode: ha mode: ha
# Deployment settings # Deployment settings