diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 8 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 48 |
2 files changed, 45 insertions, 11 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index e08cb8d08..667fc7b2a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -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} diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index d24ee120b..b856795e4 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -266,7 +266,6 @@ - tempest_smoke - neutron-tempest-plugin-api - rally_sanity - - rally_jobs - refstack_defcore - patrole - snaps_smoke @@ -278,6 +277,15 @@ - 'functest-{repo}-{container}-{tag}-{test}-run' - project: + name: 'functest-opnfv-functest-smoke-2' + <<: *functest-params + container: 'functest-smoke' + test: + - rally_jobs + jobs: + - 'functest-{repo}-{container}-{tag}-{test}-run' + +- project: name: 'functest-opnfv-functest-benchmarking' <<: *functest-params container: 'functest-benchmarking' @@ -294,6 +302,14 @@ test: - tempest_full - tempest_scenario + jobs: + - 'functest-{repo}-{container}-{tag}-{test}-run' + +- project: + name: 'functest-opnfv-functest-components-2' + <<: *functest-params + container: 'functest-components' + test: - rally_full jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -407,8 +423,6 @@ <<: *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}-patrole-run' @@ -424,6 +438,11 @@ - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' @@ -437,6 +456,9 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' <<: *functest-jobs + - multijob: + name: opnfv/functest-components:{tag} + projects: - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: @@ -694,8 +716,6 @@ <<: *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}-patrole-run' @@ -711,6 +731,11 @@ - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' @@ -724,6 +749,9 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' <<: *functest-jobs + - multijob: + name: opnfv/functest-components:{tag} + projects: - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: @@ -881,8 +909,6 @@ <<: *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}-patrole-run' @@ -898,6 +924,11 @@ - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' @@ -911,6 +942,9 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' <<: *functest-jobs + - multijob: + name: opnfv/functest-components:{tag} + projects: - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: |