diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-09-03 16:36:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-03 16:36:23 +0000 |
| commit | f61775482871211ebce64cdc25fb6f8857899945 (patch) | |
| tree | c5275eb551711e652d6bbde52e3afd56086c2cef | |
| parent | fde219fb44ab6303cd59ff3075574b1c3e1ba337 (diff) | |
| parent | 190c6b1994e9b9504330455b8b791d0994ed50e6 (diff) | |
Merge "Build and run functest-benchmarking"
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 8 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 9 |
3 files changed, 17 insertions, 3 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 7adfdffc7..744a7de4e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -61,8 +61,10 @@ run_test() { case ${test_name} in 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} ;; - tempest_smoke|rally_sanity|refstack_defcore|patrole|shaker|snaps_smoke|neutron_trunk|barbican) + tempest_smoke|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; + shaker|vmtp) + FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; tempest_full|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify_ims|vyos_vrouter|juju_epc) @@ -170,13 +172,13 @@ else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) else - tiers=(healthcheck smoke features vnf) + tiers=(healthcheck smoke benchmarking features vnf) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) else - tiers=(healthcheck smoke features) + tiers=(healthcheck smoke benchmarking features) fi fi run_tiers ${tiers} diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 1239db5af..763d1d4f0 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -290,6 +290,8 @@ - 'patrole' - 'odl' - 'snaps_smoke' + - 'shaker' + - 'vmtp' - 'neutron_trunk' - 'doctor-notification' - 'bgpvpn' @@ -308,6 +310,7 @@ choices: - 'healthcheck' - 'smoke' + - 'benchmarking' - 'features' - 'components' - 'vnf' diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 74738f280..fc2fd3cae 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -31,6 +31,7 @@ - 'components' - 'parser' - 'smoke' + - 'benchmarking' - 'vnf' exclude: @@ -38,6 +39,8 @@ image: 'parser' - stream: 'fraser' image: 'tempest' + - stream: 'fraser' + image: 'benchmarking' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -152,6 +155,10 @@ <<: *build-job-settings - name: 'functest-smoke-docker-build-arm64-{stream}' <<: *build-job-settings + - name: 'functest-benchmarking-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-benchmarking-docker-build-arm64-{stream}' + <<: *build-job-settings - name: 'functest-vnf-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-vnf-docker-build-arm64-{stream}' @@ -171,6 +178,8 @@ <<: *manifest-job-settings - name: 'functest-smoke-docker-manifest-{stream}' <<: *manifest-job-settings + - name: 'functest-benchmarking-docker-manifest-{stream}' + <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings |