X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fairship%2Fairship.yaml;h=d54f8cfb09abb0fdb089482d24d9370a6f8d6928;hb=a67786b44aaa5518caaf941309607b1461bf662c;hp=0f903af2af31b45594ecfcc4840b35401f995eae;hpb=7d9f16a0a853036136cfcfec49e43d8ec52f5886;p=releng.git

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 0f903af2a..d54f8cfb0 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -81,8 +81,8 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$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 \
@@ -97,6 +97,8 @@
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
+            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\
+          site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
             $image run_tests -t {test} -r -p
 
 - builder:
@@ -274,6 +276,7 @@
       - cinder_test
       - odl
       - tempest_smoke
+      - tempest_horizon
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
@@ -282,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'
 
@@ -323,6 +326,46 @@
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
+- builder:
+    name: airship-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: 'airship-{tag}-zip'
+    parameters:
+      - airship-build_tag:
+          build_tag: ''
+    builders:
+      - airship-zip:
+          <<: *airship-containers
+
+- project:
+    name: 'airship-{tag}-zip'
+    <<: *airship-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'airship-{tag}-zip'
+
 - job-template:
     name: 'airship-{tag}-daily'
     project-type: multijob
@@ -401,15 +444,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}-neutron-tempest_cinder-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs
@@ -423,13 +470,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}
@@ -458,6 +503,11 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *airship-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'airship-{tag}-zip'
+              <<: *airship-jobs
 
 - trigger:
     name: airship-patchset-created
@@ -561,13 +611,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}
@@ -583,10 +631,6 @@
           projects:
             - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-cloudify_ims-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-heat_ims-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'