From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Mon, 10 May 2021 23:23:04 +0000 (+0000)
Subject: Merge "Passing $WORKSPACE to build-image.sh"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=da2c360e74aa1be43f1d760f7f28f8ffdb571a16;hp=2135df3aabc76086a8e1888ccd8321f182d3d664;p=releng.git

Merge "Passing $WORKSPACE to build-image.sh"
---

diff --git a/global-jjb b/global-jjb
index 623134d64..bee1d1152 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 623134d6449371e8bc28095e53abc051bbb6b4a2
+Subproject commit bee1d1152f7fd19e81ef23344011541d1d66a091
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 15dcf767c..ae84749ca 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -29,36 +29,6 @@
           dependency: 3.11
           buildargs: --build-arg K8S_TAG=1.18
           from: s/:kali$/:v1.18/g
-      - v1.17:
-          buildargs:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          from: s/:jerma$/:v1.17/g
-      - v1.16:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          buildargs: --build-arg K8S_TAG=1.16
-          from: s/:jerma$/:v1.16/g
-      - v1.15:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          from: s/:iruya$/:v1.15/g
-      - v1.14:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          buildargs: --build-arg K8S_TAG=1.14
-          from: s/:iruya$/:v1.14/g
-      - v1.13:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1
-          dependency: 3.9
-          from: s/:hunter$/:v1.13/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
     name: 'functest-kubernetes-ng-jobs'
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 062d8f8fa..36748bb38 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -12,41 +12,29 @@
     port:
     tag:
       - latest:
+          slave: lf-virtual1-7
+      - v1.21:
           slave: lf-virtual1-6
       - leguer:
           slave: lf-virtual1-5
       - kali:
           slave: lf-virtual1-4
-      - jerma:
-          slave: lf-virtual1-3
-      - iruya:
-          slave: lf-virtual1-2
-      - hunter:
-          slave: lf-virtual1-1
       - arm-latest:
+          slave: lf-virtual1-7
+      - arm-v1.21:
           slave: lf-virtual1-6
       - arm-leguer:
           slave: lf-virtual1-5
       - arm-kali:
           slave: lf-virtual1-4
-      - arm-jerma:
-          slave: lf-virtual1-3
-      - arm-iruya:
-          slave: lf-virtual1-2
-      - arm-hunter:
-          slave: lf-virtual1-1
       - arm64-latest:
+          slave: lf-virtual1-7
+      - arm64-v1.21:
           slave: lf-virtual1-6
       - arm64-leguer:
           slave: lf-virtual1-5
       - arm64-kali:
           slave: lf-virtual1-4
-      - arm64-jerma:
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          slave: lf-virtual1-1
 
 - functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
     name: 'functest-kubernetes-pi-jobs'
@@ -277,161 +265,12 @@
     network: bridge
     exclude:
       - {'tag': 'latest', 'test': 'k8s_io'}
+      - {'tag': 'v1.21', 'test': 'k8s_io'}
       - {'tag': 'jerma', 'test': 'k8s_io'}
-      - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'jerma', 'test': 'sig_apps'}
-      - {'tag': 'jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'jerma', 'test': 'sig_auth'}
-      - {'tag': 'jerma', 'test': 'sig_cli'}
-      - {'tag': 'jerma', 'test': 'sig_cli_serial'}
-      - {'tag': 'jerma', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'jerma', 'test': 'sig_instrumentation'}
-      - {'tag': 'jerma', 'test': 'sig_network'}
-      - {'tag': 'jerma', 'test': 'sig_network_serial'}
-      - {'tag': 'jerma', 'test': 'sig_node'}
-      - {'tag': 'jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'jerma', 'test': 'sig_storage'}
-      - {'tag': 'jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'iruya', 'test': 'k8s_io'}
-      - {'tag': 'iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'iruya', 'test': 'sig_apps'}
-      - {'tag': 'iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'iruya', 'test': 'sig_auth'}
-      - {'tag': 'iruya', 'test': 'sig_cli'}
-      - {'tag': 'iruya', 'test': 'sig_cli_serial'}
-      - {'tag': 'iruya', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'iruya', 'test': 'sig_instrumentation'}
-      - {'tag': 'iruya', 'test': 'sig_network'}
-      - {'tag': 'iruya', 'test': 'sig_network_serial'}
-      - {'tag': 'iruya', 'test': 'sig_node'}
-      - {'tag': 'iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'iruya', 'test': 'sig_storage'}
-      - {'tag': 'iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'hunter', 'test': 'k8s_io'}
-      - {'tag': 'hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'hunter', 'test': 'sig_apps'}
-      - {'tag': 'hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'hunter', 'test': 'sig_auth'}
-      - {'tag': 'hunter', 'test': 'sig_cli'}
-      - {'tag': 'hunter', 'test': 'sig_cli_serial'}
-      - {'tag': 'hunter', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'hunter', 'test': 'sig_instrumentation'}
-      - {'tag': 'hunter', 'test': 'sig_network'}
-      - {'tag': 'hunter', 'test': 'sig_network_serial'}
-      - {'tag': 'hunter', 'test': 'sig_node'}
-      - {'tag': 'hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'hunter', 'test': 'sig_storage'}
-      - {'tag': 'hunter', 'test': 'sig_storage_serial'}
       - {'tag': 'arm-latest', 'test': 'k8s_io'}
-      - {'tag': 'arm-jerma', 'test': 'k8s_io'}
-      - {'tag': 'arm-jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_apps'}
-      - {'tag': 'arm-jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_auth'}
-      - {'tag': 'arm-jerma', 'test': 'sig_cli'}
-      - {'tag': 'arm-jerma', 'test': 'sig_cli_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'arm-jerma', 'test': 'sig_instrumentation'}
-      - {'tag': 'arm-jerma', 'test': 'sig_network'}
-      - {'tag': 'arm-jerma', 'test': 'sig_network_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_node'}
-      - {'tag': 'arm-jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_storage'}
-      - {'tag': 'arm-jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm-iruya', 'test': 'k8s_io'}
-      - {'tag': 'arm-iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_apps'}
-      - {'tag': 'arm-iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_auth'}
-      - {'tag': 'arm-iruya', 'test': 'sig_cli'}
-      - {'tag': 'arm-iruya', 'test': 'sig_cli_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'arm-iruya', 'test': 'sig_instrumentation'}
-      - {'tag': 'arm-iruya', 'test': 'sig_network'}
-      - {'tag': 'arm-iruya', 'test': 'sig_network_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_node'}
-      - {'tag': 'arm-iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_storage'}
-      - {'tag': 'arm-iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm-hunter', 'test': 'k8s_io'}
-      - {'tag': 'arm-hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_apps'}
-      - {'tag': 'arm-hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_auth'}
-      - {'tag': 'arm-hunter', 'test': 'sig_cli'}
-      - {'tag': 'arm-hunter', 'test': 'sig_cli_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'arm-hunter', 'test': 'sig_instrumentation'}
-      - {'tag': 'arm-hunter', 'test': 'sig_network'}
-      - {'tag': 'arm-hunter', 'test': 'sig_network_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_node'}
-      - {'tag': 'arm-hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm-hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm-v1.21', 'test': 'k8s_io'}
       - {'tag': 'arm64-latest', 'test': 'k8s_io'}
-      - {'tag': 'arm64-jerma', 'test': 'k8s_io'}
-      - {'tag': 'arm64-jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_apps'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_auth'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_cli'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_cli_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_instrumentation'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_network'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_network_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_node'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'k8s_io'}
-      - {'tag': 'arm64-iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_apps'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_auth'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_cli'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_cli_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_instrumentation'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_network'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_network_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_node'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_storage'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'k8s_io'}
-      - {'tag': 'arm64-hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_apps'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_auth'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_cli'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_cli_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_instrumentation'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_network'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_network_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_node'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm64-v1.21', 'test': 'k8s_io'}
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -454,6 +293,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -466,7 +306,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -534,9 +374,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-pi-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -627,6 +467,8 @@
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
@@ -634,7 +476,7 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-pi-jobs
-            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: dump all campaign data
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 59b64e664..2fe7e5405 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -17,6 +17,12 @@
           branch: master
           slave: lf-virtual1-6
           dependency: 3.13
+      - v1.21:
+          from:
+          buildargs:
+          branch: stable/v1.21
+          slave: lf-virtual1-6
+          dependency: 3.13
       - leguer:
           from:
           buildargs:
@@ -29,24 +35,6 @@
           branch: stable/kali
           slave: lf-virtual1-4
           dependency: 3.11
-      - jerma:
-          from:
-          buildargs:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-          dependency: 3.10
-      - iruya:
-          from:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-          dependency: 3.9
-      - hunter:
-          from:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1-1
-          dependency: 3.9
 
 - functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
@@ -277,57 +265,7 @@
     network: bridge
     exclude:
       - {'tag': 'latest', 'test': 'k8s_io'}
-      - {'tag': 'jerma', 'test': 'k8s_io'}
-      - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'jerma', 'test': 'sig_apps'}
-      - {'tag': 'jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'jerma', 'test': 'sig_auth'}
-      - {'tag': 'jerma', 'test': 'sig_cli'}
-      - {'tag': 'jerma', 'test': 'sig_cli_serial'}
-      - {'tag': 'jerma', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'jerma', 'test': 'sig_instrumentation'}
-      - {'tag': 'jerma', 'test': 'sig_network'}
-      - {'tag': 'jerma', 'test': 'sig_network_serial'}
-      - {'tag': 'jerma', 'test': 'sig_node'}
-      - {'tag': 'jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'jerma', 'test': 'sig_storage'}
-      - {'tag': 'jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'iruya', 'test': 'k8s_io'}
-      - {'tag': 'iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'iruya', 'test': 'sig_apps'}
-      - {'tag': 'iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'iruya', 'test': 'sig_auth'}
-      - {'tag': 'iruya', 'test': 'sig_cli'}
-      - {'tag': 'iruya', 'test': 'sig_cli_serial'}
-      - {'tag': 'iruya', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'iruya', 'test': 'sig_instrumentation'}
-      - {'tag': 'iruya', 'test': 'sig_network'}
-      - {'tag': 'iruya', 'test': 'sig_network_serial'}
-      - {'tag': 'iruya', 'test': 'sig_node'}
-      - {'tag': 'iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'iruya', 'test': 'sig_storage'}
-      - {'tag': 'iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'hunter', 'test': 'k8s_io'}
-      - {'tag': 'hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'hunter', 'test': 'sig_apps'}
-      - {'tag': 'hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'hunter', 'test': 'sig_auth'}
-      - {'tag': 'hunter', 'test': 'sig_cli'}
-      - {'tag': 'hunter', 'test': 'sig_cli_serial'}
-      - {'tag': 'hunter', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'hunter', 'test': 'sig_instrumentation'}
-      - {'tag': 'hunter', 'test': 'sig_network'}
-      - {'tag': 'hunter', 'test': 'sig_network_serial'}
-      - {'tag': 'hunter', 'test': 'sig_node'}
-      - {'tag': 'hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'hunter', 'test': 'sig_storage'}
-      - {'tag': 'hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'v1.21', 'test': 'k8s_io'}
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -350,6 +288,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -362,7 +301,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -430,9 +369,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -523,6 +462,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -530,7 +471,7 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
@@ -803,9 +744,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -917,6 +858,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -924,7 +867,7 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
 
 - project:
@@ -1063,9 +1006,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove dependency
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 78635d7c8..f045f9e18 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -23,12 +23,6 @@
       - jerma:
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
-      - iruya:
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-      - hunter:
-          slave: lf-virtual6
-          DASHBOARD_URL: http://172.30.13.91
       - arm-latest:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -41,12 +35,6 @@
       - arm-jerma:
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
-      - arm-iruya:
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-      - arm-hunter:
-          slave: lf-virtual6
-          DASHBOARD_URL: http://172.30.13.91
       - arm64-latest:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -59,12 +47,6 @@
       - arm64-jerma:
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
-      - arm64-iruya:
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-      - arm64-hunter:
-          slave: lf-virtual6
-          DASHBOARD_URL: http://172.30.13.91
 
 - functest-pi-jobs: &functest-pi-jobs
     name: 'functest-pi-jobs'
@@ -364,20 +346,6 @@
       - {'tag': 'jerma', 'test': 'patrole_member'}
       - {'tag': 'jerma', 'test': 'patrole_reader'}
       - {'tag': 'jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'iruya', 'test': 'patrole_admin'}
-      - {'tag': 'iruya', 'test': 'patrole_member'}
-      - {'tag': 'iruya', 'test': 'patrole_reader'}
-      - {'tag': 'iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'hunter', 'test': 'refstack_compute'}
-      - {'tag': 'hunter', 'test': 'refstack_object'}
-      - {'tag': 'hunter', 'test': 'refstack_platform'}
-      - {'tag': 'hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'hunter', 'test': 'patrole_admin'}
-      - {'tag': 'hunter', 'test': 'patrole_member'}
-      - {'tag': 'hunter', 'test': 'patrole_reader'}
-      - {'tag': 'hunter', 'test': 'tempest_cyborg'}
       - {'tag': 'arm-latest', 'test': 'refstack_defcore'}
       - {'tag': 'arm-latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'arm-latest', 'test': 'networking-sfc'}
@@ -399,20 +367,6 @@
       - {'tag': 'arm-jerma', 'test': 'patrole_member'}
       - {'tag': 'arm-jerma', 'test': 'patrole_reader'}
       - {'tag': 'arm-jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_admin'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_member'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_reader'}
-      - {'tag': 'arm-iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_compute'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_object'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_platform'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_admin'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_member'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_reader'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_cyborg'}
       - {'tag': 'arm64-latest', 'test': 'refstack_defcore'}
       - {'tag': 'arm64-latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'arm64-latest', 'test': 'networking-sfc'}
@@ -434,20 +388,6 @@
       - {'tag': 'arm64-jerma', 'test': 'patrole_member'}
       - {'tag': 'arm64-jerma', 'test': 'patrole_reader'}
       - {'tag': 'arm64-jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_member'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_compute'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_object'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_platform'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_member'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_cyborg'}
     jobs:
       - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
 
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index f91212fed..6c2add0d5 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -39,20 +39,6 @@
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
           dependency: 3.10
-      - iruya:
-          from:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-          dependency: 3.9
-      - hunter:
-          from:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual6
-          DASHBOARD_URL: http://172.30.13.91
-          dependency: 3.9
 
 - functest-jobs: &functest-jobs
     name: 'functest-jobs'
@@ -352,20 +338,6 @@
       - {'tag': 'jerma', 'test': 'patrole_member'}
       - {'tag': 'jerma', 'test': 'patrole_reader'}
       - {'tag': 'jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'iruya', 'test': 'patrole_admin'}
-      - {'tag': 'iruya', 'test': 'patrole_member'}
-      - {'tag': 'iruya', 'test': 'patrole_reader'}
-      - {'tag': 'iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'hunter', 'test': 'refstack_compute'}
-      - {'tag': 'hunter', 'test': 'refstack_object'}
-      - {'tag': 'hunter', 'test': 'refstack_platform'}
-      - {'tag': 'hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'hunter', 'test': 'patrole_admin'}
-      - {'tag': 'hunter', 'test': 'patrole_member'}
-      - {'tag': 'hunter', 'test': 'patrole_reader'}
-      - {'tag': 'hunter', 'test': 'tempest_cyborg'}
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 2af9fd988..88ba74849 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -13,40 +13,34 @@
     tag:
       - latest:
           slave: lf-virtual1
+      - wallaby:
+          slave: lf-virtual1
       - leguer:
           slave: lf-virtual1
       - kali:
           slave: lf-virtual1
       - jerma:
           slave: lf-virtual1
-      - iruya:
-          slave: lf-virtual1
-      - hunter:
-          slave: lf-virtual1
       - arm-latest:
           slave: lf-virtual1
+      - arm-wallaby:
+          slave: lf-virtual1
       - arm-leguer:
           slave: lf-virtual1
       - arm-kali:
           slave: lf-virtual1
       - arm-jerma:
           slave: lf-virtual1
-      - arm-iruya:
-          slave: lf-virtual1
-      - arm-hunter:
-          slave: lf-virtual1
       - arm64-latest:
           slave: lf-virtual1
+      - arm64-wallaby:
+          slave: lf-virtual1
       - arm64-leguer:
           slave: lf-virtual1
       - arm64-kali:
           slave: lf-virtual1
       - arm64-jerma:
           slave: lf-virtual1
-      - arm64-iruya:
-          slave: lf-virtual1
-      - arm64-hunter:
-          slave: lf-virtual1
 
 - xtesting-pi-jobs: &xtesting-pi-jobs
     name: 'xtesting-pi-jobs'
@@ -203,18 +197,12 @@
       - {'tag': 'leguer', 'test': 'eighth'}
       - {'tag': 'kali', 'test': 'eighth'}
       - {'tag': 'jerma', 'test': 'eighth'}
-      - {'tag': 'iruya', 'test': 'eighth'}
-      - {'tag': 'hunter', 'test': 'eighth'}
       - {'tag': 'arm-leguer', 'test': 'eighth'}
       - {'tag': 'arm-kali', 'test': 'eighth'}
       - {'tag': 'arm-jerma', 'test': 'eighth'}
-      - {'tag': 'arm-iruya', 'test': 'eighth'}
-      - {'tag': 'arm-hunter', 'test': 'eighth'}
       - {'tag': 'arm64-leguer', 'test': 'eighth'}
       - {'tag': 'arm64-kali', 'test': 'eighth'}
       - {'tag': 'arm64-jerma', 'test': 'eighth'}
-      - {'tag': 'arm64-iruya', 'test': 'eighth'}
-      - {'tag': 'arm64-hunter', 'test': 'eighth'}
     jobs:
       - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
 
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index a80892cce..1239ad0be 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -17,6 +17,12 @@
           branch: master
           slave: lf-virtual1
           dependency: 3.13
+      - wallaby:
+          from:
+          buildargs:
+          branch: stable/wallaby
+          slave: lf-virtual1
+          dependency: 3.13
       - leguer:
           from:
           buildargs:
@@ -35,18 +41,6 @@
           branch: stable/jerma
           slave: lf-virtual1
           dependency: 3.10
-      - iruya:
-          from:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-      - hunter:
-          from:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1
-          dependency: 3.9
 
 - xtesting-jobs: &xtesting-jobs
     name: 'xtesting-jobs'
@@ -203,8 +197,6 @@
       - {'tag': 'leguer', 'test': 'eighth'}
       - {'tag': 'kali', 'test': 'eighth'}
       - {'tag': 'jerma', 'test': 'eighth'}
-      - {'tag': 'iruya', 'test': 'eighth'}
-      - {'tag': 'hunter', 'test': 'eighth'}
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index 42a4d29e7..35fda14ec 100644
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -20,6 +20,8 @@
       - jerma
       - kali
       - leguer
+      - v1.21
+      - wallaby
 
     jobs:
       - 'releng-release-{stream}-verify'
diff --git a/releases/schema.yaml b/releases/schema.yaml
index c3838760a..f84c87093 100644
--- a/releases/schema.yaml
+++ b/releases/schema.yaml
@@ -46,7 +46,7 @@ properties:
       properties:
         name:
           type: 'string'
-          pattern: '^stable/[a-z]+$'
+          pattern: '^stable/[a-z0-9.]+$'
         location:
           type: 'object'
       required: ['name', 'location']
diff --git a/releases/v1.21/functest.yaml b/releases/v1.21/functest.yaml
new file mode 100644
index 000000000..44b630cdc
--- /dev/null
+++ b/releases/v1.21/functest.yaml
@@ -0,0 +1,9 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/v1.21
+    location:
+      functest-kubernetes: 3a58b1019c0f0a3e4ec3ce8be16ffd9a15edf518
diff --git a/releases/wallaby/functest.yaml b/releases/wallaby/functest.yaml
new file mode 100644
index 000000000..19f760798
--- /dev/null
+++ b/releases/wallaby/functest.yaml
@@ -0,0 +1,12 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/wallaby
+    location:
+      functest: be8185f6345d499c80c71bf0dbbd1402069e1c81
+  - name: stable/wallaby
+    location:
+      functest-xtesting: ecedaa857ff821cad5dc9fa423d1a596ea255efe