X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fcntt.yaml;h=adc91fd8b753ccb25260b2a20728e7511e5ed880;hb=83e216498dbeffc7777cdafff97da7302e38cfbe;hp=78d940bf68de5333875678af8ba271fc5d170692;hpb=f877ce23a63fc1c9bb3db96adcf9ec4bd58baead;p=releng.git

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 78d940bf6..adc91fd8b 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -10,7 +10,7 @@
     tag:
       - latest:
           branch: master
-          slave: intel-pod10
+          slave: intel-pod15
           functest_tag: hunter
 
 - parameter:
@@ -20,12 +20,18 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: cntt-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: cntt-DEBUG
     parameters:
       - string:
           name: DEBUG
-          default: 'true'
+          default: 'false'
 
 - parameter:
     name: cntt-EXTERNAL_NETWORK
@@ -75,12 +81,13 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/cntt/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -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 NODE_NAME=$slave \
             -e INSTALLER_TYPE=cntt \
+            -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -v /home/opnfv/functest/.boto:/root/.boto \
             -e DEBUG=$DEBUG \
@@ -198,6 +205,13 @@
     jobs:
       - '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
@@ -242,6 +256,13 @@
     jobs:
       - '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
@@ -254,8 +275,10 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-DEBUG:
-          DEBUG: 'true'
+          DEBUG: 'false'
       - cntt-EXTERNAL_NETWORK:
           EXTERNAL_NETWORK: public
     builders:
@@ -279,6 +302,7 @@
       - cinder_test
       - odl
       - tempest_smoke
+      - tempest_horizon
     jobs:
       - 'cntt-{repo}-{container}-{tag}-{test}-run'
 
@@ -287,16 +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'
 
@@ -305,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'
 
@@ -327,6 +355,16 @@
     jobs:
       - '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
@@ -340,18 +378,61 @@
     jobs:
       - 'cntt-{repo}-{container}-{tag}-{test}-run'
 
+- builder:
+    name: cntt-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{functest_tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{functest_tag}
+          else
+            image={repo}:{port}/{container}:{functest_tag}
+          fi
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -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 \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'cntt-{tag}-zip'
+    parameters:
+      - cntt-build_tag:
+          build_tag: ''
+    builders:
+      - cntt-zip:
+          <<: *cntt-containers
+
+- project:
+    name: 'cntt-{tag}-zip'
+    <<: *cntt-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'cntt-{tag}-zip'
+
 - job-template:
     name: 'cntt-{tag}-daily'
+    disabled: true
     project-type: multijob
     triggers:
       - timed: '@daily'
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-branch:
           branch: 'master'
       - cntt-DEBUG:
-          DEBUG: 'true'
+          DEBUG: 'false'
       - cntt-EXTERNAL_NETWORK:
           EXTERNAL_NETWORK: public
     properties:
@@ -377,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:
@@ -390,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:
@@ -420,11 +505,19 @@
               <<: *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
@@ -434,32 +527,35 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_slow-run'
               <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-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}
@@ -473,6 +569,14 @@
               <<: *cntt-jobs
             - 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
@@ -488,6 +592,11 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *cntt-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'cntt-{tag}-zip'
+              <<: *cntt-jobs
 
 - trigger:
     name: cntt-patchset-created
@@ -514,16 +623,18 @@
 
 - job-template:
     name: 'cntt-{tag}-gate'
-    project-type: multijob
     disabled: true
+    project-type: multijob
     triggers:
       - cntt-patchset-created:
           branch: '{branch}'
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-DEBUG:
-          DEBUG: 'true'
+          DEBUG: 'false'
       - cntt-EXTERNAL_NETWORK:
           EXTERNAL_NETWORK: public
     properties:
@@ -549,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:
@@ -562,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:
@@ -594,30 +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'
-              <<: *cntt-jobs
-      - multijob:
-          name: opnfv/functest-smoke-cntt:{tag}
-          projects:
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
-              <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
-              <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
-              <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
-              <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
-              <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
-              <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *cntt-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}