diff options
Diffstat (limited to 'jjb/airship')
| -rw-r--r-- | jjb/airship/airship.yaml | 27 | ||||
| -rw-r--r-- | jjb/airship/cntt.yaml | 106 |
2 files changed, 90 insertions, 43 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml index 076715958..f8cd2cdf8 100644 --- a/jjb/airship/airship.yaml +++ b/jjb/airship/airship.yaml @@ -276,6 +276,7 @@ - cinder_test - odl - tempest_smoke + - tempest_horizon jobs: - 'airship-{repo}-{container}-{tag}-{test}-run' @@ -284,19 +285,19 @@ <<: *airship-params container: 'functest-smoke' test: - - neutron-tempest-plugin-api + - tempest_neutron - tempest_cinder - tempest_keystone + - tempest_heat - rally_sanity - refstack_defcore - tempest_full - tempest_scenario - tempest_slow - patrole - - neutron_trunk - networking-bgpvpn - networking-sfc - - barbican + - tempest_barbican jobs: - 'airship-{repo}-{container}-{tag}-{test}-run' @@ -367,6 +368,7 @@ - job-template: name: 'airship-{tag}-daily' + disabled: true project-type: multijob triggers: - timed: '@daily' @@ -443,15 +445,19 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *airship-jobs - multijob: name: opnfv/functest-smoke:{functest_tag} condition: ALWAYS projects: - - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_neutron-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_cinder-run' + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run' + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_heat-run' <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *airship-jobs @@ -465,13 +471,11 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-patrole-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *airship-jobs - multijob: name: opnfv/functest-benchmarking:{functest_tag} @@ -531,6 +535,7 @@ - job-template: name: 'airship-{tag}-gate' + disabled: true project-type: multijob triggers: - airship-patchset-created: @@ -608,13 +613,11 @@ projects: - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *airship-jobs - multijob: name: opnfv/functest-benchmarking:{functest_tag} diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml index ea8e51ded..adc91fd8b 100644 --- a/jjb/airship/cntt.yaml +++ b/jjb/airship/cntt.yaml @@ -31,7 +31,7 @@ parameters: - string: name: DEBUG - default: 'true' + default: 'false' - parameter: name: cntt-EXTERNAL_NETWORK @@ -206,6 +206,13 @@ - 'cntt-{repo}-{container}-{tag}-pull' - project: + name: 'cntt-opnfv-functest-benchmarking-cntt-pull' + <<: *cntt-params + container: 'functest-benchmarking-cntt' + jobs: + - 'cntt-{repo}-{container}-{tag}-pull' + +- project: name: 'cntt-opnfv-functest-vnf-pull' <<: *cntt-params container: 'functest-vnf' @@ -250,6 +257,13 @@ - 'cntt-{repo}-{container}-{tag}-rmi' - project: + name: 'cntt-opnfv-functest-benchmarking-cntt-rmi' + <<: *cntt-params + container: 'functest-benchmarking-cntt' + jobs: + - 'cntt-{repo}-{container}-{tag}-rmi' + +- project: name: 'cntt-opnfv-functest-vnf-rmi' <<: *cntt-params container: 'functest-vnf' @@ -264,7 +278,7 @@ - cntt-build_tag: build_tag: '' - cntt-DEBUG: - DEBUG: 'true' + DEBUG: 'false' - cntt-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public builders: @@ -288,6 +302,7 @@ - cinder_test - odl - tempest_smoke + - tempest_horizon jobs: - 'cntt-{repo}-{container}-{tag}-{test}-run' @@ -296,19 +311,19 @@ <<: *cntt-params container: 'functest-smoke' test: - - neutron-tempest-plugin-api + - tempest_neutron - tempest_cinder - tempest_keystone + - tempest_heat - rally_sanity - refstack_defcore - tempest_full - tempest_scenario - tempest_slow - patrole - - neutron_trunk - networking-bgpvpn - networking-sfc - - barbican + - tempest_barbican jobs: - 'cntt-{repo}-{container}-{tag}-{test}-run' @@ -317,13 +332,14 @@ <<: *cntt-params container: 'functest-smoke-cntt' test: - - neutron-tempest-plugin-api - - tempest_cinder - - tempest_keystone - - rally_sanity - - tempest_full - - tempest_scenario - - tempest_slow + - tempest_neutron_cntt + - tempest_cinder_cntt + - tempest_keystone_cntt + - tempest_heat_cntt + - rally_sanity_cntt + - tempest_full_cntt + - tempest_scenario_cntt + - tempest_slow_cntt jobs: - 'cntt-{repo}-{container}-{tag}-{test}-run' @@ -340,6 +356,16 @@ - 'cntt-{repo}-{container}-{tag}-{test}-run' - project: + name: 'cntt-opnfv-functest-benchmarking-cntt' + <<: *cntt-params + container: 'functest-benchmarking-cntt' + test: + - rally_full_cntt + - rally_jobs_cntt + jobs: + - 'cntt-{repo}-{container}-{tag}-{test}-run' + +- project: name: 'cntt-opnfv-functest-vnf' <<: *cntt-params container: 'functest-vnf' @@ -367,8 +393,8 @@ fi sudo docker run --rm \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ - -e S3_DST_URL=s3://artifacts.opnfv.org/airship \ - -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/ \ + -e S3_DST_URL=s3://artifacts.opnfv.org/cntt \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/ \ -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \ -e BUILD_TAG=$BUILD_TAG \ @@ -406,7 +432,7 @@ - cntt-branch: branch: 'master' - cntt-DEBUG: - DEBUG: 'true' + DEBUG: 'false' - cntt-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public properties: @@ -432,6 +458,8 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi' <<: *cntt-jobs + - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rmi' + <<: *cntt-jobs - name: 'cntt-opnfv-functest-vnf-{tag}-rmi' <<: *cntt-jobs - multijob: @@ -445,6 +473,8 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-benchmarking-{tag}-pull' <<: *cntt-jobs + - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-pull' + <<: *cntt-jobs - name: 'cntt-opnfv-functest-vnf-{tag}-pull' <<: *cntt-jobs - multijob: @@ -475,16 +505,20 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *cntt-jobs + - name: 'cntt-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *cntt-jobs - multijob: name: opnfv/functest-smoke:{functest_tag} condition: ALWAYS projects: - - name: 'cntt-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_neutron-run' <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_keystone-run' <<: *cntt-jobs + - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_heat-run' + <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -497,31 +531,31 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *cntt-jobs - multijob: name: opnfv/functest-smoke-cntt:{tag} condition: ALWAYS projects: - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run' + <<: *cntt-jobs + - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run' <<: *cntt-jobs - multijob: name: opnfv/functest-benchmarking:{functest_tag} @@ -536,6 +570,14 @@ - name: 'cntt-opnfv-functest-benchmarking-{tag}-shaker-run' <<: *cntt-jobs - multijob: + name: opnfv/functest-benchmarking-cntt:{functest_tag} + condition: ALWAYS + projects: + - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run' + <<: *cntt-jobs + - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run' + <<: *cntt-jobs + - multijob: name: opnfv/functest-vnf:{functest_tag} condition: ALWAYS execution-type: SEQUENTIALLY @@ -581,8 +623,8 @@ - job-template: name: 'cntt-{tag}-gate' - project-type: multijob disabled: true + project-type: multijob triggers: - cntt-patchset-created: branch: '{branch}' @@ -592,7 +634,7 @@ - cntt-build_tag: build_tag: '' - cntt-DEBUG: - DEBUG: 'true' + DEBUG: 'false' - cntt-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public properties: @@ -618,6 +660,8 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi' <<: *cntt-jobs + - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rmi' + <<: *cntt-jobs - name: 'cntt-opnfv-functest-vnf-{tag}-rmi' <<: *cntt-jobs - multijob: @@ -631,6 +675,8 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-benchmarking-{tag}-pull' <<: *cntt-jobs + - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-pull' + <<: *cntt-jobs - name: 'cntt-opnfv-functest-vnf-{tag}-pull' <<: *cntt-jobs - multijob: @@ -663,13 +709,11 @@ projects: - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_scenario-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *cntt-jobs - name: 'cntt-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *cntt-jobs - - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *cntt-jobs - multijob: name: opnfv/functest-benchmarking:{functest_tag} |