Merge "Apex: Refactor snapshot pipeline for other types"

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index df02766..d47e444 100644 (file)
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -7,6 +7,36 @@
       - hunter
       - latest
 
+- job-template:
+    name: '{repo}-functest-{container}-{tag}-pull'
+    parameters:
+      - functest-virtual-defaults
+    builders:
+      - shell: sudo docker pull {repo}/functest-{container}:{tag}
+
+- project:
+    name: repo-functest-container-tag-pull
+    <<: *functest-defaultparameters
+    container:
+      - healthcheck
+      - smoke
+      - benchmarking
+      - components
+      - vnf
+      - features
+    jobs:
+      - '{repo}-functest-{container}-{tag}-pull'
+
+- functest-pulljobs: &functest-pulljobs
+    name: 'functest-pulljobs'
+    projects:
+      - name: '{repo}-functest-healthcheck-{tag}-pull'
+      - name: '{repo}-functest-smoke-{tag}-pull'
+      - name: '{repo}-functest-benchmarking-{tag}-pull'
+      - name: '{repo}-functest-components-{tag}-pull'
+      - name: '{repo}-functest-vnf-{tag}-pull'
+      - name: '{repo}-functest-features-{tag}-pull'
+
 - functest-buildparameters: &functest-buildparameters
     name: 'functest-buildparameters'
     parameters:
@@ -21,13 +51,19 @@
       - functest-virtual-defaults
     builders:
       - shell: |
-          sudo docker run \
+          sudo docker run --rm \
             -e EXTERNAL_NETWORK=public1 \
             -v /home/opnfv/functest/results/$JOB_NAME-$BUILD_ID:\
           /home/opnfv/functest/results \
             -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/python2.7/site-packages/functest/opnfv_tests/openstack/\
+          tempest/custom_tests/blacklist.yaml \
+            -v /home/opnfv/functest/images/rally_blacklist.yaml:\
+          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
+          rally/blacklist.yaml \
             {repo}/functest-{container}:{tag} run_tests -t {test}
 
 - project:
@@ -75,6 +111,7 @@
     test:
       - tempest_smoke
       - neutron-tempest-plugin-api
+      - rally_sanity
       - rally_jobs
       - refstack_defcore
       - patrole
@@ -91,6 +128,7 @@
     projects:
       - name: '{repo}-functest-smoke-tempest_smoke-{tag}-run'
       - name: '{repo}-functest-smoke-neutron-tempest-plugin-api-{tag}-run'
+      - name: '{repo}-functest-smoke-rally_sanity-{tag}-run'
       - name: '{repo}-functest-smoke-rally_jobs-{tag}-run'
       - name: '{repo}-functest-smoke-refstack_defcore-{tag}-run'
       - name: '{repo}-functest-smoke-patrole-{tag}-run'
@@ -123,7 +161,6 @@
     test:
       - tempest_full
       - tempest_scenario
-      - rally_full
     jobs:
       - '{repo}-functest-{container}-{test}-{tag}-run'
 
@@ -132,7 +169,6 @@
     projects:
       - name: '{repo}-functest-components-tempest_full-{tag}-run'
       - name: '{repo}-functest-components-tempest_scenario-{tag}-run'
-      - name: '{repo}-functest-components-rally_full-{tag}-run'
 
 - project:
     name: repo-functest-vnf-{test}-{tag}-run
@@ -187,6 +223,9 @@
     parameters:
       - functest-virtual-defaults
     builders:
+      - multijob:
+          name: pull containers
+          <<: *functest-pulljobs
       - multijob:
           name: healthcheck
           <<: *functest-healthcheckjobs
@@ -196,6 +235,12 @@
       - multijob:
           name: benchmarking
           <<: *functest-benchmarkingjobs
+      - multijob:
+          name: components
+          <<: *functest-componentsjobs
+      - multijob:
+          name: vnf
+          <<: *functest-vnfjobs
       - multijob:
           name: features
           <<: *functest-featuresjobs
@@ -291,6 +336,12 @@
       - multijob:
           name: benchmarking
           <<: *functest-benchmarkingjobs
+      - multijob:
+          name: components
+          <<: *functest-componentsjobs
+      - multijob:
+          name: vnf
+          <<: *functest-vnfjobs
       - multijob:
           name: features
           <<: *functest-featuresjobs