diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 22 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 58 |
3 files changed, 43 insertions, 39 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 91ca5eb88..52f65ba7e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -55,13 +55,13 @@ run_test() { cmd_opt="run_tests -t ${test_name}" # Determine which Functest image should be used for the test case case ${test_name} in - connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) + connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check|tempest_smoke) FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; - tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) + neutron-tempest-plugin-api|rally_sanity|refstack_defcore|tempest_full|tempest_scenario|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; - shaker|vmtp) + rally_jobs|shaker|vmtp) FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; - tempest_full_parallel|tempest_full|tempest_scenario|rally_full) + rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; @@ -85,6 +85,7 @@ run_test() { [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" +redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt @@ -107,12 +108,11 @@ rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" echo "Functest: Start Docker and prepare environment" echo "Functest: Download images that will be used by test cases" +env +pwd +ls -l images_dir="${HOME}/opnfv/functest/images" download_script=${WORKSPACE}/functest/ci/download_images.sh -if [[ ! -f ${download_script} ]]; then - # to support Danube as well - wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O ${download_script} 2> ${redirect} -fi chmod +x ${download_script} ${download_script} ${images_dir} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} @@ -267,21 +267,21 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then tiers=(${FUNCTEST_TIER}) run_tiers ${tiers} else - tests=(tempest_full tempest_scenario) + tests=() skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) tests=(tempest_full_parallel) else - tiers=(healthcheck smoke benchmarking features vnf) + tiers=(healthcheck smoke benchmarking features vnf components) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) tests=(tempest_full_parallel) else - tiers=(healthcheck smoke benchmarking features) + tiers=(healthcheck smoke benchmarking features components) fi fi run_tiers ${tiers} diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 19967e9fd..03ef43629 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -42,6 +42,8 @@ exclude: - stream: 'master' + image: 'components' + - stream: 'master' image: 'parser' - stream: 'hunter' image: 'parser' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index d24ee120b..2433594b3 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -10,6 +10,8 @@ tag: - latest: branch: master + - hunter: + branch: stable/hunter - parameter: name: functest-slave @@ -255,6 +257,7 @@ - odl - api_check - snaps_health_check + - tempest_smoke jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -263,11 +266,11 @@ <<: *functest-params container: 'functest-smoke' test: - - tempest_smoke - neutron-tempest-plugin-api - rally_sanity - - rally_jobs - refstack_defcore + - tempest_full + - tempest_scenario - patrole - snaps_smoke - neutron_trunk @@ -282,6 +285,7 @@ <<: *functest-params container: 'functest-benchmarking' test: + - rally_jobs - vmtp - shaker jobs: @@ -292,8 +296,6 @@ <<: *functest-params container: 'functest-components' test: - - tempest_full - - tempest_scenario - rally_full jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -398,19 +400,21 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' @@ -426,6 +430,8 @@ - multijob: name: opnfv/functest-benchmarking:{tag} projects: + - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' @@ -433,10 +439,6 @@ - multijob: name: opnfv/functest-components:{tag} projects: - - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: @@ -685,19 +687,21 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' @@ -713,6 +717,8 @@ - multijob: name: opnfv/functest-benchmarking:{tag} projects: + - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' @@ -720,10 +726,6 @@ - multijob: name: opnfv/functest-components:{tag} projects: - - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: @@ -872,19 +874,21 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' @@ -900,6 +904,8 @@ - multijob: name: opnfv/functest-benchmarking:{tag} projects: + - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' @@ -907,10 +913,6 @@ - multijob: name: opnfv/functest-components:{tag} projects: - - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: |