Merge "create iruya stable branch for Yardstick"

[releng.git] / jjb / airship / cntt.yaml

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 78d940b..98d0ae3 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -20,6 +20,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: cntt-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: cntt-DEBUG
     parameters:
@@ -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 \
@@ -254,6 +261,8 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-DEBUG:
           DEBUG: 'true'
       - cntt-EXTERNAL_NETWORK:
@@ -288,10 +297,13 @@
     container: 'functest-smoke'
     test:
       - neutron-tempest-plugin-api
+      - tempest_cinder
+      - tempest_keystone
       - rally_sanity
       - refstack_defcore
       - tempest_full
       - tempest_scenario
+      - tempest_slow
       - patrole
       - neutron_trunk
       - networking-bgpvpn
@@ -340,6 +352,46 @@
     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/airship \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/ \
+            -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'
     project-type: multijob
@@ -348,6 +400,8 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-branch:
           branch: 'master'
       - cntt-DEBUG:
@@ -426,6 +480,10 @@
           projects:
             - name: 'cntt-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-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}-rally_sanity-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -434,6 +492,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -446,6 +506,7 @@
               <<: *cntt-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
+          condition: ALWAYS
           projects:
             - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
               <<: *cntt-jobs
@@ -488,6 +549,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
@@ -522,6 +588,8 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-DEBUG:
           DEBUG: 'true'
       - cntt-EXTERNAL_NETWORK:
@@ -602,23 +670,6 @@
               <<: *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'
-              <<: *cntt-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}
           projects: