diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/add_proxy.sh | 53 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 18 |
3 files changed, 73 insertions, 1 deletions
diff --git a/functest/ci/add_proxy.sh b/functest/ci/add_proxy.sh new file mode 100644 index 000000000..3244f246a --- /dev/null +++ b/functest/ci/add_proxy.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +set -e + +pushd "${1:-/home/opnfv/functest/images}" > /dev/null + +images=${images-"\ +cloudify-manager-premium-4.0.1.qcow2 \ +ubuntu-14.04-server-cloudimg-amd64-disk1.img \ +ubuntu-16.04-server-cloudimg-amd64-disk1.img"} + +add_proxy () { + cat << EOF >> "$1" +http_proxy=${http_proxy:-http://proxy:8080} +HTTP_PROXY=${http_proxy:-http://proxy:8080} +https_proxy=${https_proxy:-${http_proxy:-http://proxy:8080}} +HTTPS_PROXY=${https_proxy:-${http_proxy:-http://proxy:8080}} +ftp_proxy=${ftp_proxy:-${http_proxy:-http://proxy:8080}} +FTP_PROXY=${ftp_proxy:-${http_proxy:-http://proxy:8080}} +no_proxy=${no_proxy:-"10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"} +NO_PROXY=${no_proxy:-"10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"} +EOF +} + +add_proxy_apt () { + cat << EOF >> "$1" +Acquire::http::Proxy "${http_proxy:-http://proxy:8080}"; +Acquire::https::Proxy "${https_proxy:-http://proxy:8080}"; +EOF +} + +tmpdir=$(mktemp -d) +for image in $images; do + if [ ! -f "$image" ]; then + echo "skip ${image} ($(pwd)/${image} not found)" + continue + fi + guestmount -a "${image}" -i --rw "${tmpdir}" + add_proxy "${tmpdir}/etc/environment" + if [[ ${image} == *"cloudify-manager"* ]]; then + echo >> "${tmpdir}/etc/sysconfig/cloudify-mgmtworker" + add_proxy "${tmpdir}/etc/sysconfig/cloudify-mgmtworker" + echo >> "${tmpdir}/etc/sysconfig/cloudify-restservice" + add_proxy "${tmpdir}/etc/sysconfig/cloudify-restservice" + fi + if [[ ${image} == "ubuntu"* ]]; then + add_proxy_apt "${tmpdir}/etc/apt/apt.conf" + fi + guestunmount "${tmpdir}" +done + +rmdir "${tmpdir}" +popd > /dev/null diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 7e51ee790..dbea320c9 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -11,8 +11,9 @@ general: functest_conf: /home/opnfv/functest/conf functest_data: /home/opnfv/functest/data ims_data: /home/opnfv/functest/data/ims/ + rally_data: /home/opnfv/functest/data/rally refstack_data: /home/opnfv/functest/data/refstack - router_data: /home/opnfv/functest/data/router/ + router_data: /home/opnfv/functest/data/router/opnfv-vnf-data functest_images: /home/opnfv/functest/images rally_inst: /root/.rally diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 2413287ac..16365b0b7 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -225,6 +225,17 @@ tiers: name: rally_sanity - + case_name: rally_jobs + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs a group of Rally jobs used in + OpenStack gating + run: + name: rally_jobs + + - case_name: refstack_defcore project_name: functest criteria: 100 @@ -254,6 +265,7 @@ tiers: - 'network' excludes: - 'test_networks_multiprovider_rbac' + - 'test_auto_allocated_topology_rbac' - case_name: snaps_smoke @@ -386,6 +398,7 @@ tiers: - case_name: doctor-notification project_name: doctor + enabled: false criteria: 100 blocking: false description: >- @@ -401,6 +414,7 @@ tiers: - case_name: bgpvpn project_name: sdnvpn + enabled: false criteria: 100 blocking: false description: >- @@ -413,6 +427,7 @@ tiers: - case_name: functest-odl-sfc project_name: sfc + enabled: false criteria: 100 blocking: false description: >- @@ -426,6 +441,7 @@ tiers: - case_name: barometercollectd project_name: barometer + enabled: false criteria: 100 blocking: false description: >- @@ -440,6 +456,7 @@ tiers: - case_name: fds project_name: fastdatastacks + enabled: false criteria: 100 blocking: false description: >- @@ -468,6 +485,7 @@ tiers: - case_name: stor4nfv_os project_name: stor4nfv + enabled: false criteria: 100 blocking: false description: >- |