diff options
| -rw-r--r-- | jjb/functest/functest.yaml | 134 |
1 files changed, 122 insertions, 12 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 9b1ed578d..7b2515d29 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -39,6 +39,20 @@ name: branch default: '{branch}' +- parameter: + name: functest-DEBUG + parameters: + - string: + name: DEBUG + default: 'true' + +- parameter: + name: functest-EXTERNAL_NETWORK + parameters: + - string: + name: EXTERNAL_NETWORK + default: public + - functest-containers: &functest-containers name: 'functest-containers' repo: '{repo}' @@ -47,7 +61,7 @@ tag: '{tag}' - functest-run-containers: &functest-run-containers - name: 'functest-build-containers' + name: 'functest-run-containers' <<: *functest-containers test: '{test}' dashboard_url: '{dashboard_url}' @@ -117,13 +131,13 @@ py=2.7 fi sudo docker run --rm \ - -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e DEBUG=True \ - -e EXTERNAL_NETWORK=public \ - -e DASHBOARD_URL={dashboard_url} \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ + -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=$DEBUG \ + -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ + -e DASHBOARD_URL={dashboard_url} \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\ @@ -181,6 +195,13 @@ - 'functest-{repo}-{container}-{tag}-pull' - project: + name: 'functest-opnfv-functest-smoke-cntt-pull' + <<: *functest-params + container: 'functest-smoke-cntt' + jobs: + - 'functest-{repo}-{container}-{tag}-pull' + +- project: name: 'functest-opnfv-functest-benchmarking-pull' <<: *functest-params container: 'functest-benchmarking' @@ -218,6 +239,13 @@ - 'functest-{repo}-{container}-{tag}-rmi' - project: + name: 'functest-opnfv-functest-smoke-cntt-rmi' + <<: *functest-params + container: 'functest-smoke-cntt' + jobs: + - 'functest-{repo}-{container}-{tag}-rmi' + +- project: name: 'functest-opnfv-functest-benchmarking-rmi' <<: *functest-params container: 'functest-benchmarking' @@ -236,6 +264,10 @@ parameters: - functest-slave: slave: '{slave}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public builders: - functest-run-containers: <<: *functest-run-containers @@ -270,8 +302,8 @@ container: 'functest-smoke' test: - neutron-tempest-plugin-api - - tempest_keystone - tempest_cinder + - tempest_keystone - rally_sanity - refstack_defcore - refstack_compute @@ -309,6 +341,17 @@ - 'functest-{repo}-{container}-{tag}-{test}-run' - project: + name: 'functest-opnfv-functest-smoke-cntt' + <<: *functest-params + container: 'functest-smoke-cntt' + test: + - neutron-tempest-plugin-api + - tempest_cinder + - tempest_keystone + jobs: + - 'functest-{repo}-{container}-{tag}-{test}-run' + +- project: name: 'functest-opnfv-functest-benchmarking' <<: *functest-params container: 'functest-benchmarking' @@ -341,6 +384,10 @@ parameters: - functest-slave: slave: '{slave}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public properties: - build-blocker: use-build-blocker: true @@ -355,6 +402,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' @@ -366,6 +415,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-pull' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-pull' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-pull' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-pull' @@ -404,10 +455,10 @@ projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -437,6 +488,15 @@ - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' @@ -573,6 +633,16 @@ - 'functest-{repo}-{container}-{tag}-gate' - 'functest-{repo}-{container}-{tag}-check' +- project: + name: functest-opnfv-functest-smoke-cntt-{tag}-build + <<: *functest-params + container: functest-smoke-cntt + ref_arg: BRANCH + path: docker/smoke-cntt + jobs: + - 'functest-{repo}-{container}-{tag}-gate' + - 'functest-{repo}-{container}-{tag}-check' + - job-template: name: 'functest-{tag}-check' project-type: multijob @@ -581,6 +651,10 @@ slave: '{slave}' - functest-branch: branch: '{branch}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public properties: - build-blocker: use-build-blocker: true @@ -595,6 +669,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' @@ -631,6 +707,11 @@ - name: 'functest-opnfv-functest-vnf-{tag}-check' <<: *functest-jobs - multijob: + name: build opnfv/functest-smoke-cntt + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check' + <<: *functest-jobs + - multijob: name: opnfv/functest-healthcheck:{tag} projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' @@ -664,10 +745,10 @@ projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -697,6 +778,15 @@ - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' @@ -754,6 +844,10 @@ parameters: - functest-slave: slave: '{slave}' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public properties: - build-blocker: use-build-blocker: true @@ -768,6 +862,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' @@ -804,6 +900,11 @@ - name: 'functest-opnfv-functest-vnf-{tag}-gate' <<: *functest-jobs - multijob: + name: build opnfv/functest-smoke-cntt + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate' + <<: *functest-jobs + - multijob: name: opnfv/functest-healthcheck:{tag} projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' @@ -837,10 +938,10 @@ projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -870,6 +971,15 @@ - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' <<: *functest-jobs - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-jobs + - multijob: name: opnfv/functest-benchmarking:{tag} projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' |