X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=9792950b7bed1d18b7f82e7ccb4d1dc5f183e578;hb=dd2505fed033cdd4c6a76fed951aeef35971079f;hp=a67051ae052b582cbf1ae9077887cd44583e1921;hpb=790da759a787eda66f1dc4cb38852dc54bae2ebf;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index a67051ae0..9792950b7 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,6 +10,8 @@
     tag:
       - latest:
           branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
 
@@ -241,8 +243,6 @@
       - vping_userdata
       - cinder_test
       - odl
-      - api_check
-      - snaps_health_check
       - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -258,7 +258,6 @@
       - tempest_full
       - tempest_scenario
       - patrole
-      - snaps_smoke
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
@@ -297,7 +296,6 @@
     container: 'functest-features'
     test:
       - doctor-notification
-      - bgpvpn
       - functest-odl-sfc
       - barometercollectd
       - vgpu
@@ -317,7 +315,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -370,10 +368,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
@@ -391,8 +385,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
@@ -431,8 +423,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
@@ -469,20 +459,20 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.8-rmi'
+    name: 'functest-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.8-pull'
+    name: 'functest-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -568,7 +558,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -586,12 +576,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -641,10 +631,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
@@ -662,8 +648,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
@@ -702,8 +686,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
@@ -749,7 +731,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -767,12 +749,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -822,10 +804,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
@@ -843,8 +821,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
@@ -883,8 +859,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'