summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-05-01 15:16:17 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-05-01 15:16:17 +0200
commit1b32ec1b908c059b78dcfd3118d24dd44944b730 (patch)
tree2f1acc8f75b66384947e0c69d493c95eb87d44bd /jjb/functest
parent227672e6c2b644eaf0a5e1649a76ec7f57dc08ef (diff)
Publish Functest Kubernetes v1.21 jobs
Change-Id: I4dc12e3425d9973a827560ff2f00f33f3a01507a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml13
-rw-r--r--jjb/functest/functest-kubernetes.yaml19
2 files changed, 24 insertions, 8 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 062d8f8fa..de58455dc 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -12,6 +12,8 @@
port:
tag:
- latest:
+ slave: lf-virtual1-7
+ - v1.21:
slave: lf-virtual1-6
- leguer:
slave: lf-virtual1-5
@@ -24,6 +26,8 @@
- hunter:
slave: lf-virtual1-1
- arm-latest:
+ slave: lf-virtual1-7
+ - arm-v1.21:
slave: lf-virtual1-6
- arm-leguer:
slave: lf-virtual1-5
@@ -36,6 +40,8 @@
- 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
@@ -277,6 +283,7 @@
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'}
@@ -329,6 +336,7 @@
- {'tag': 'hunter', 'test': 'sig_storage'}
- {'tag': 'hunter', 'test': 'sig_storage_serial'}
- {'tag': 'arm-latest', 'test': 'k8s_io'}
+ - {'tag': 'arm-v1.21', 'test': 'k8s_io'}
- {'tag': 'arm-jerma', 'test': 'k8s_io'}
- {'tag': 'arm-jerma', 'test': 'k8s_conformance_serial'}
- {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
@@ -381,6 +389,7 @@
- {'tag': 'arm-hunter', 'test': 'sig_storage'}
- {'tag': 'arm-hunter', 'test': 'sig_storage_serial'}
- {'tag': 'arm64-latest', 'test': 'k8s_io'}
+ - {'tag': 'arm64-v1.21', 'test': 'k8s_io'}
- {'tag': 'arm64-jerma', 'test': 'k8s_io'}
- {'tag': 'arm64-jerma', 'test': 'k8s_conformance_serial'}
- {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
@@ -534,9 +543,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
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 59b64e664..37b9509de 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:
@@ -277,6 +283,7 @@
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'}
@@ -430,9 +437,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
@@ -803,9 +810,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
@@ -1063,9 +1070,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