External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-01-31 17:19:17 -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

16
tests/Makefile
View File

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