diff options
| -rw-r--r-- | ci/README.md | 7 | ||||
| -rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 3 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/ci/README.md b/ci/README.md new file mode 100644 index 00000000..c0873dad --- /dev/null +++ b/ci/README.md @@ -0,0 +1,7 @@ +The scripts located in this folder are used by OPNFV XCI/Jenkins +and they are not supposed to be used by users and developers. + +The scripts are executed by Jenkins jobs directly in execute-shell +or by simple wrappers so the most of the XCI specific logic is +developed and maintained for XCI CI gets verified like the rest of +XCI scripts. diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index f12f831c..82b14d1c 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -115,9 +115,6 @@ args: creates: "/usr/local/bin/openstack-ansible" - changed_when: True - args: - chdir: "{{openstack_osa_path}}" - name: install opnfv pip required packages pip: name: "{{ item }}" 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}" |