summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml9
-rw-r--r--jjb/functest/functest-kubernetes.yaml15
-rw-r--r--jjb/functest/functest-pi.yaml36
-rw-r--r--jjb/functest/functest.yaml36
-rw-r--r--jjb/functest/xtesting-pi.yaml13
-rw-r--r--jjb/functest/xtesting.yaml12
6 files changed, 120 insertions, 1 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index b997e6651..88603663d 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -10,6 +10,9 @@
tag:
- latest:
branch: master
+ slave: lf-virtual1-6
+ - leguer:
+ branch: stable/leguer
slave: lf-virtual1-5
- kali:
branch: stable/kali
@@ -25,6 +28,9 @@
slave: lf-virtual1-1
- arm-latest:
branch: master
+ slave: lf-virtual1-6
+ - arm-leguer:
+ branch: stable/leguer
slave: lf-virtual1-5
- arm-kali:
branch: stable/kali
@@ -40,6 +46,9 @@
slave: lf-virtual1-1
- arm64-latest:
branch: master
+ slave: lf-virtual1-6
+ - arm64-leguer:
+ branch: stable/leguer
slave: lf-virtual1-5
- arm64-kali:
branch: stable/kali
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 6912cd68b..5b45e1921 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,6 +10,9 @@
tag:
- latest:
branch: master
+ slave: lf-virtual1-6
+ - leguer:
+ branch: stable/leguer
slave: lf-virtual1-5
- kali:
branch: stable/kali
@@ -25,6 +28,9 @@
slave: lf-virtual1-1
- arm64-latest:
branch: master
+ slave: lf-virtual1-6
+ - arm64-leguer:
+ branch: stable/leguer
slave: lf-virtual1-5
- arm64-kali:
branch: stable/kali
@@ -531,6 +537,7 @@
slave: master
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -547,6 +554,7 @@
slave: master
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -562,6 +570,7 @@
path: docker/core
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -578,6 +587,7 @@
path: docker/healthcheck
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -594,6 +604,7 @@
path: docker/cnf
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -610,6 +621,7 @@
path: docker/security
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -626,6 +638,7 @@
path: docker/smoke
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -642,6 +655,7 @@
path: docker/benchmarking
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -897,6 +911,7 @@
<<: *functest-kubernetes-params
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 51aea3006..045a38ea6 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -12,6 +12,10 @@
branch: master
slave: lf-virtual9
dashboard_url: http://172.30.13.94
+ - leguer:
+ branch: stable/leguer
+ slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- kali:
branch: stable/kali
slave: lf-pod4-3
@@ -32,6 +36,10 @@
branch: master
slave: lf-virtual9
dashboard_url: http://172.30.13.94
+ - arm-leguer:
+ branch: stable/leguer
+ slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- arm-kali:
branch: stable/kali
slave: lf-pod4-3
@@ -52,6 +60,10 @@
branch: master
slave: lf-virtual9
dashboard_url: http://172.30.13.94
+ - arm64-leguer:
+ branch: stable/leguer
+ slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- arm64-kali:
branch: stable/kali
slave: lf-pod4-3
@@ -378,6 +390,14 @@
test: networking-sfc
- tag: latest
test: patrole
+ - tag: leguer
+ test: refstack_defcore
+ - tag: leguer
+ test: networking-bgpvpn
+ - tag: leguer
+ test: networking-sfc
+ - tag: leguer
+ test: patrole
- tag: kali
test: refstack_defcore
- tag: kali
@@ -440,6 +460,14 @@
test: networking-sfc
- tag: arm-latest
test: patrole
+ - tag: arm-leguer
+ test: refstack_defcore
+ - tag: arm-leguer
+ test: networking-bgpvpn
+ - tag: arm-leguer
+ test: networking-sfc
+ - tag: arm-leguer
+ test: patrole
- tag: arm-kali
test: refstack_defcore
- tag: arm-kali
@@ -502,6 +530,14 @@
test: networking-sfc
- tag: arm64-latest
test: patrole
+ - tag: arm64-leguer
+ test: refstack_defcore
+ - tag: arm64-leguer
+ test: networking-bgpvpn
+ - tag: arm64-leguer
+ test: networking-sfc
+ - tag: arm64-leguer
+ test: patrole
- tag: arm64-kali
test: refstack_defcore
- tag: arm64-kali
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 120fca829..bf6995b1c 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -12,6 +12,10 @@
branch: master
slave: lf-virtual9
dashboard_url: http://172.30.13.94
+ - leguer:
+ branch: stable/leguer
+ slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- kali:
branch: stable/kali
slave: lf-pod4-3
@@ -32,6 +36,10 @@
branch: master
slave: lf-virtual9
dashboard_url: http://172.30.13.94
+ - arm64-leguer:
+ branch: stable/leguer
+ slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- arm64-kali:
branch: stable/kali
slave: lf-pod4-3
@@ -398,6 +406,14 @@
test: networking-sfc
- tag: latest
test: patrole
+ - tag: leguer
+ test: refstack_defcore
+ - tag: leguer
+ test: networking-bgpvpn
+ - tag: leguer
+ test: networking-sfc
+ - tag: leguer
+ test: patrole
- tag: kali
test: refstack_defcore
- tag: kali
@@ -460,6 +476,14 @@
test: networking-sfc
- tag: arm64-latest
test: patrole
+ - tag: arm64-leguer
+ test: refstack_defcore
+ - tag: arm64-leguer
+ test: networking-bgpvpn
+ - tag: arm64-leguer
+ test: networking-sfc
+ - tag: arm64-leguer
+ test: patrole
- tag: arm64-kali
test: refstack_defcore
- tag: arm64-kali
@@ -866,6 +890,7 @@
slave: master
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -882,6 +907,7 @@
slave: master
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -897,6 +923,7 @@
path: docker/core
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -916,9 +943,11 @@
- 'functest-{repo}-{container}-{tag}-check'
exclude:
- tag: latest
+ - tag: leguer
- tag: kali
- tag: jerma
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -932,6 +961,7 @@
path: docker/healthcheck
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -948,6 +978,7 @@
path: docker/smoke
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -964,6 +995,7 @@
path: docker/benchmarking
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -980,6 +1012,7 @@
path: docker/benchmarking-cntt
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -996,6 +1029,7 @@
path: docker/vnf
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -1012,6 +1046,7 @@
path: docker/smoke-cntt
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
@@ -1465,6 +1500,7 @@
<<: *functest-params
exclude:
- tag: arm64-latest
+ - tag: arm64-leguer
- tag: arm64-kali
- tag: arm64-jerma
- tag: arm64-iruya
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index f27f19354..ef4609f6c 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -11,6 +11,9 @@
- latest:
branch: master
slave: lf-virtual1
+ - leguer:
+ branch: stable/leguer
+ slave: lf-virtual1
- kali:
branch: stable/kali
slave: lf-virtual1
@@ -26,6 +29,9 @@
- arm-latest:
branch: master
slave: lf-virtual1
+ - arm-leguer:
+ branch: stable/leguer
+ slave: lf-virtual1
- arm-kali:
branch: stable/kali
slave: lf-virtual1
@@ -41,6 +47,9 @@
- arm64-latest:
branch: master
slave: lf-virtual1
+ - arm64-leguer:
+ branch: stable/leguer
+ slave: lf-virtual1
- arm64-kali:
branch: stable/kali
slave: lf-virtual1
@@ -181,6 +190,7 @@
- tag: arm-iruya
- tag: arm-jerma
- tag: arm-kali
+ - tag: arm-leguer
- tag: arm-latest
- tag: arm64-hunter
- tag: arm64-iruya
@@ -218,6 +228,7 @@
- tag: arm-iruya
- tag: arm-jerma
- tag: arm-kali
+ - tag: arm-leguer
- tag: arm-latest
- tag: arm64-hunter
- tag: arm64-iruya
@@ -291,6 +302,8 @@
test: seventh
- tag: arm-kali
test: seventh
+ - tag: arm-leguer
+ test: seventh
- tag: arm-latest
test: seventh
- tag: arm64-hunter
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 626e99607..f4635eced 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -11,6 +11,9 @@
- latest:
branch: master
slave: lf-virtual1
+ - leguer:
+ branch: stable/leguer
+ slave: lf-virtual1
- kali:
branch: stable/kali
slave: lf-virtual1
@@ -26,6 +29,9 @@
- arm64-latest:
branch: master
slave: lf-virtual1
+ - arm64-leguer:
+ branch: stable/leguer
+ slave: lf-virtual1
- arm64-kali:
branch: stable/kali
slave: lf-virtual1
@@ -160,7 +166,7 @@
build_arg="--build-arg {ref_arg}={ref}"
fi
case {tag} in
- *latest)
+ *latest|*leguer)
cd {path};;
*)
cd docker;;
@@ -462,6 +468,7 @@
- tag: arm64-iruya
- tag: arm64-jerma
- tag: arm64-kali
+ - tag: arm64-leguer
- tag: arm64-latest
jobs:
- 'xtesting-{repo}-{container}-{tag}-pull'
@@ -477,6 +484,7 @@
- tag: arm64-iruya
- tag: arm64-jerma
- tag: arm64-kali
+ - tag: arm64-leguer
- tag: arm64-latest
jobs:
- 'xtesting-{repo}-{container}-{tag}-gate'
@@ -497,6 +505,7 @@
- tag: arm64-iruya
- tag: arm64-jerma
- tag: arm64-kali
+ - tag: arm64-leguer
- tag: arm64-latest
jobs:
- 'xtesting-{repo}-{container}-{tag}-gate'
@@ -674,6 +683,7 @@
- tag: arm64-iruya
- tag: arm64-jerma
- tag: arm64-kali
+ - tag: arm64-leguer
- tag: arm64-latest
jobs:
- 'xtesting-{tag}-check'