X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=7d468348e02eef27b8d67cb194aaf1e65dd28d6a;hb=b89957c233341f1e23b4a8359ca39a5bc7fd74e0;hp=05fad55e6956156ecdc3b5116b4aedc0f299d6dc;hpb=d77a45334371bcd8b0ddfa8b1062d5851a6670fc;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 05fad55e6..7d468348e 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -11,6 +11,9 @@
       - latest:
           branch: master
           slave: lf-virtual9
+      - jerma:
+          branch: stable/jerma
+          slave: lf-virtual4
       - iruya:
           branch: stable/iruya
           slave: lf-virtual4
@@ -101,6 +104,8 @@
           fi
           if [ "{tag}" = "latest" ]; then
             py=3.7
+          elif [ "{tag}" = "iruya" ]; then
+            py=3.6
           else
             py=2.7
           fi
@@ -184,13 +189,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'functest-opnfv-functest-features-pull'
-    <<: *functest-params
-    container: 'functest-features'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
-
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
@@ -228,13 +226,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
-- project:
-    name: 'functest-opnfv-functest-features-rmi'
-    <<: *functest-params
-    container: 'functest-features'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
-
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-{test}-run'
     parameters:
@@ -287,10 +278,10 @@
     exclude:
       - tag: latest
         test: refstack_defcore
-      - tag: iruya
+      - tag: jerma
         test: refstack_defcore
       - tag: iruya
-        test: tempest_slow
+        test: refstack_defcore
       - tag: iruya
         test: octavia
       - tag: hunter
@@ -331,19 +322,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
-- project:
-    name: 'functest-opnfv-functest-features'
-    <<: *functest-params
-    container: 'functest-features'
-    test:
-      - doctor-notification
-      - functest-odl-sfc
-      - barometercollectd
-      - vgpu
-      - stor4nfv_os
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
 - job-template:
     name: 'functest-{tag}-daily'
     project-type: multijob
@@ -370,8 +348,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: pull containers
           projects:
@@ -383,8 +359,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-pull'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -470,19 +444,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
@@ -553,6 +514,7 @@
       - 'functest-{repo}-{container}-{tag}-check'
     exclude:
       - tag: latest
+      - tag: jerma
 
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
@@ -594,16 +556,6 @@
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
 
-- project:
-    name: functest-opnfv-functest-features-{tag}-build
-    <<: *functest-params
-    container: functest-features
-    ref_arg: BRANCH
-    path: docker/features
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
-
 - job-template:
     name: 'functest-{tag}-check'
     project-type: multijob
@@ -630,8 +582,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
@@ -663,8 +613,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-check'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -750,19 +698,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - trigger:
     name: functest-patchset-created
@@ -814,8 +749,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
@@ -847,8 +780,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-gate'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -934,19 +865,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - project:
     name: 'functest'