diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 16 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 8 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 28 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 32 |
5 files changed, 46 insertions, 40 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 6bd2248bd..c858b7f65 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -140,9 +140,9 @@ <<: *master - 'os-odl-sfc-ha': <<: *master - - 'os-odl-fdio-dvr-noha': + - 'os-odl-fdio_dvr-noha': <<: *master - - 'os-odl-fdio-dvr-ha': + - 'os-odl-fdio_dvr-ha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -182,9 +182,9 @@ <<: *euphrates - 'os-odl-sfc-ha': <<: *euphrates - - 'os-odl-fdio-dvr-noha': + - 'os-odl-fdio_dvr-noha': <<: *euphrates - - 'os-odl-fdio-dvr-ha': + - 'os-odl-fdio_dvr-ha': <<: *euphrates platform: @@ -1809,7 +1809,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master' + - name: 'apex-os-odl-fdio_dvr-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1818,7 +1818,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master' + - name: 'apex-os-odl-fdio_dvr-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -2008,7 +2008,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-noha-baremetal-euphrates' + - name: 'apex-os-odl-fdio_dvr-noha-baremetal-euphrates' node-parameters: false current-parameters: false predefined-parameters: | @@ -2017,7 +2017,7 @@ abort-all-job: true git-revision: false - - name: 'apex-os-odl-fdio-dvr-ha-baremetal-euphrates' + - name: 'apex-os-odl-fdio_dvr-ha-baremetal-euphrates' node-parameters: false current-parameters: false predefined-parameters: | diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index e7fe92375..a89aa5de2 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -18,8 +18,8 @@ master: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-odl-fdio-dvr-noha' - - 'os-odl-fdio-dvr-ha' + - 'os-odl-fdio_dvr-noha' + - 'os-odl-fdio_dvr-ha' euphrates: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' @@ -40,8 +40,8 @@ euphrates: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-odl-fdio-dvr-noha' - - 'os-odl-fdio-dvr-ha' + - 'os-odl-fdio_dvr-noha' + - 'os-odl-fdio_dvr-ha' danube: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 2c1298a6b..b107c6520 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -95,7 +95,7 @@ - 'os-odl-sfc-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-dpdk-ha': + - 'os-nosdn-ovs_dpdk-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - 'k8-nosdn-nofeature-ha': @@ -116,7 +116,7 @@ - 'os-odl-sfc-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-dpdk-noha': + - 'os-nosdn-ovs_dpdk-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' @@ -442,7 +442,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-centos-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger' triggers: - timed: '' - trigger: @@ -478,7 +478,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-centos-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger' triggers: - timed: '' @@ -522,7 +522,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-ha-huawei-pod7-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger' triggers: - timed: '' - trigger: @@ -558,7 +558,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-huawei-pod7-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger' triggers: - timed: '' #-------------------- @@ -601,7 +601,7 @@ triggers: - timed: '0 14 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger' triggers: - timed: '0 16 * * *' - trigger: @@ -637,7 +637,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger' triggers: - timed: '' @@ -681,7 +681,7 @@ triggers: - timed: '0 13 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger' triggers: - timed: '0 9 * * *' - trigger: @@ -717,7 +717,7 @@ triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-dpdk-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' triggers: - timed: '' @@ -761,7 +761,7 @@ triggers: - timed: '0 13 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-virtual-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger' triggers: - timed: '0 17 * * *' - trigger: @@ -797,7 +797,7 @@ triggers: - timed: '0 20 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-noha-virtual-master-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger' triggers: - timed: '0 11 * * *' @@ -841,7 +841,7 @@ triggers: - timed: '0 16 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger' triggers: - timed: '0 14 * * *' - trigger: @@ -877,6 +877,6 @@ triggers: - timed: '0 19 * * *' - trigger: - name: 'compass-os-nosdn-dpdk-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' triggers: - timed: '0 12 * * *' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 9d4ae5175..ad069a57c 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -39,7 +39,7 @@ elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then export NETWORK_CONF_FILE=network_openo.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-dpdk" ]]; then +elif [[ "${DEPLOY_SCENARIO}" =~ "-ovs_dpdk" ]]; then export NETWORK_CONF_FILE=network_dpdk.yml else export NETWORK_CONF_FILE=network.yml diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8ede529a1..797f66001 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -5,13 +5,14 @@ set +u set +o pipefail run_tiers() { - cmd_opt='prepare_env start && run_tests -r -t all' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t all' + tiers=$1 + cmd_opt="prepare_env start && run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=opnfv/functest-${tier} + FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'" @@ -19,31 +20,35 @@ run_tiers() { eval ${cmd} ret_value=$? if [ ${ret_value} != 0 ]; then - echo ${ret_value} > ${ret_val_file} + echo ${ret_value} > ${ret_val_file} + if [ ${tier} == 'healthcheck' ]; then + echo "Healthcheck tier failed. Exiting Functest..." + exit 1 + fi fi done } run_test() { test_name=$1 - cmd_opt='prepare_env start && run_tests -r -t $test_name' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t $test_name' + cmd_opt="prepare_env start && run_tests -r -t ${test_name}" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t ${test_name}" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case case ${test_name} in connection_check|api_check|snaps_health_check) - FUNCTEST_IMAGE=opnfv/functest-healthcheck ;; + FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} ;; vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|fds|snaps_smoke) - FUNCTEST_IMAGE=opnfv/functest-smoke ;; + FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;; tempest_full_parallel|tempest_custom|rally_full) - FUNCTEST_IMAGE=opnfv/functest-components ;; + FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;; cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter) - FUNCTEST_IMAGE=opnfv/functest-vnf ;; + FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;; promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd) - FUNCTEST_IMAGE=opnfv/functest-features ;; - parser) - FUNCTEST_IMAGE=opnfv/functest-parser ;; + FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;; + parser-basics) + FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 @@ -66,6 +71,7 @@ FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt HOST_ARCH=$(uname -m) +DOCKER_TAG=${DOCKER_TAG:-latest} # Prepare OpenStack credentials volume rc_file=${HOME}/opnfv-openrc.sh |