diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 2 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 8 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 4 |
6 files changed, 10 insertions, 12 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 3a46e798e..a326af42e 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -148,7 +148,7 @@ predefined-parameters: | DEPLOY_SCENARIO=os-odl-nofeature-ha FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke RC_FILE_PATH=$HOME/cloner-info/overcloudrc node-parameters: true kill-phase-on: FAILURE diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 81e59bdf5..819e17b76 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -243,7 +243,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase node-parameters: false kill-phase-on: FAILURE @@ -360,7 +360,7 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index e24a2c358..bf5f067d8 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -834,7 +834,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase node-parameters: true kill-phase-on: FAILURE diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 1f5232b5f..df825d82e 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -706,7 +706,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase node-parameters: true kill-phase-on: FAILURE diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index cf63bb5a4..7adfdffc7 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -59,18 +59,16 @@ run_test() { 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) + connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; - vping_ssh|vping_userdata|cinder_test|tempest_smoke_serial|rally_sanity|refstack_defcore|patrole|odl|snaps_smoke|neutron_trunk) + tempest_smoke|rally_sanity|refstack_defcore|patrole|shaker|snaps_smoke|neutron_trunk|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; - tempest_full_parallel|rally_full) + tempest_full|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds) FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; - parser-basics) - FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 0300b99b2..1239db5af 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -284,7 +284,7 @@ - 'vping_ssh' - 'vping_userdata' - 'cinder_test' - - 'tempest_smoke_serial' + - 'tempest_smoke' - 'rally_sanity' - 'refstack_defcore' - 'patrole' @@ -296,7 +296,7 @@ - 'functest-odl-sfc' - 'barometercollectd' - 'fds' - - 'tempest_full_parallel' + - 'tempest_full' - 'rally_full' - 'cloudify_ims' - 'vyos_vrouter' |