Merge "Remove functest-components from gates"

1 files changed, 7 insertions, 60 deletions

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 2433594b3..8c7b9b3e1 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -161,13 +161,6 @@
       - 'functest-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-opnfv-functest-components-pull'
-    <<: *functest-params
-    container: 'functest-components'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
-
-- project:
     name: 'functest-opnfv-functest-vnf-pull'
     <<: *functest-params
     container: 'functest-vnf'
@@ -211,13 +204,6 @@
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-opnfv-functest-components-rmi'
-    <<: *functest-params
-    container: 'functest-components'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
-
-- project:
     name: 'functest-opnfv-functest-vnf-rmi'
     <<: *functest-params
     container: 'functest-vnf'
@@ -285,6 +271,7 @@
     <<: *functest-params
     container: 'functest-benchmarking'
     test:
+      - rally_full
       - rally_jobs
       - vmtp
       - shaker
@@ -292,15 +279,6 @@
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-opnfv-functest-components'
-    <<: *functest-params
-    container: 'functest-components'
-    test:
-      - rally_full
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
-- project:
     name: 'functest-opnfv-functest-vnf'
     <<: *functest-params
     container: 'functest-vnf'
@@ -350,8 +328,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -365,8 +341,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-pull'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-pull'
@@ -430,6 +404,8 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
@@ -437,11 +413,6 @@
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
-              <<: *functest-jobs
-      - multijob:
           name: opnfv/functest-vnf:{tag}
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
@@ -565,16 +536,6 @@
       - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-components-{tag}-build
-    <<: *functest-params
-    container: functest-components
-    ref_arg:
-    path: docker/components
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
-
-- project:
     name: functest-opnfv-functest-vnf-{tag}-build
     <<: *functest-params
     container: functest-vnf
@@ -617,8 +578,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -652,8 +611,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-check'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-check'
@@ -717,6 +674,8 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
@@ -724,11 +683,6 @@
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
-              <<: *functest-jobs
-      - multijob:
           name: opnfv/functest-vnf:{tag}
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
@@ -804,8 +758,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -839,8 +791,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-gate'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-gate'
@@ -904,6 +854,8 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
@@ -911,11 +863,6 @@
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
-              <<: *functest-jobs
-      - multijob:
           name: opnfv/functest-vnf:{tag}
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'