diff options
Diffstat (limited to 'xci/playbooks')
| -rw-r--r-- | xci/playbooks/bootstrap-scenarios.yml | 4 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml index c09d58a6..d1331252 100644 --- a/xci/playbooks/bootstrap-scenarios.yml +++ b/xci/playbooks/bootstrap-scenarios.yml @@ -37,3 +37,7 @@ include_role: name: "k8-flannel-nofeature" when: deploy_scenario == 'k8-flannel-nofeature' +- name: Prepare everything to run the k8-nosdn-nofeature scenario + include_role: + name: "k8-nosdn-nofeature" + when: deploy_scenario == 'k8-nosdn-nofeature' diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 index 0f97c3b4..7856cb0e 100644 --- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 @@ -43,7 +43,15 @@ openstack --insecure subnet create --network {{ external_network }} \ --subnet-range {{ subnet_cidr }} --gateway {{ gateway_ip }} \ --no-dhcp {{ subnet_name }} -mkdir ~/images && cd ~/images && wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img && cd ~ +# the needed images differ between the suites so avoid downloading unnecessary images +if [[ "$FUNCTEST_SUITE_NAME" =~ "healthcheck" ]]; then + mkdir ~/images && cd ~/images && wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img && cd ~ +elif [[ "$FUNCTEST_SUITE_NAME" =~ "smoke" ]]; then + mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | bash -s -- images && ls -1 images/* +else + echo "Unsupported test suite for functest" + exit 1 +fi # docker image to use will be different for healthcheck and smoke test DOCKER_IMAGE_NAME="opnfv/functest-${FUNCTEST_SUITE_NAME}" |