Update Jenkins jobs

Change-Id: Ic9a7f0a452c1c3ef509631ef7c99822b9f408c7a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 9759c6a..4dcdab4 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -33,12 +33,6 @@
           branch: stable/v1.31
           node: v1.31
           dependency: 3.20
-      - v1.30:
-          from:
-          build_args:
-          branch: stable/v1.30
-          node: v1.30
-          dependency: 3.20
 
 - _functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params: &functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
@@ -70,12 +64,6 @@
           branch: stable/v1.31
           node: v1.31
           dependency: 3.20
-      - v1.30:
-          from:
-          build_args:
-          branch: stable/v1.30
-          node: v1.30
-          dependency: 3.20
 
 - _functest-kubernetes-opnfv-functest-kubernetes-smoke-params: &functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
@@ -107,12 +95,6 @@
           branch: stable/v1.31
           node: v1.31
           dependency: 3.20
-      - v1.30:
-          from:
-          build_args:
-          branch: stable/v1.30
-          node: v1.30
-          dependency: 3.20
 
 - _functest-kubernetes-opnfv-functest-kubernetes-security-params: &functest-kubernetes-opnfv-functest-kubernetes-security-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
@@ -144,12 +126,6 @@
           branch: stable/v1.31
           node: v1.31
           dependency: 3.20
-      - v1.30:
-          from:
-          build_args:
-          branch: stable/v1.30
-          node: v1.30
-          dependency: 3.20
 
 - _functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params: &functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
@@ -181,12 +157,6 @@
           branch: stable/v1.31
           node: v1.31
           dependency: 3.20
-      - v1.30:
-          from:
-          build_args:
-          branch: stable/v1.30
-          node: v1.30
-          dependency: 3.20
 
 - _functest-kubernetes-opnfv-functest-kubernetes-cnf-params: &functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
@@ -218,12 +188,6 @@
           branch: stable/v1.31
           node: v1.31
           dependency: 3.20
-      - v1.30:
-          from:
-          build_args:
-          branch: stable/v1.30
-          node: v1.30
-          dependency: 3.20
 
 - _functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
@@ -965,8 +929,6 @@
           dependency: 3.20
       - v1.31:
           dependency: 3.20
-      - v1.30:
-          dependency: 3.20
 
 - project:
     name: 'functest-kubernetes-dep-pull'

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index a7e822a..4d178c4 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -57,18 +57,6 @@
           branch: stable/yoga
           node: opnfv-build
           dependency: 3.16
-      - xena:
-          from:
-          build_args:
-          branch: stable/xena
-          node: opnfv-build
-          dependency: 3.14
-      - wallaby:
-          from:
-          build_args:
-          branch: stable/wallaby
-          node: opnfv-build
-          dependency: 3.13
 
 - _xtesting-opnfv-xtesting-params: &xtesting-opnfv-xtesting-params
     name: 'xtesting-opnfv-xtesting-params'
@@ -124,18 +112,6 @@
           branch: stable/yoga
           node: opnfv-build
           dependency: 3.16
-      - xena:
-          from:
-          build_args:
-          branch: stable/xena
-          node: opnfv-build
-          dependency: 3.14
-      - wallaby:
-          from:
-          build_args:
-          branch: stable/wallaby
-          node: opnfv-build
-          dependency: 3.13
 
 - _xtesting-jobs: &xtesting-jobs
     name: 'xtesting-jobs'
@@ -303,11 +279,6 @@
     network: bridge
     uid: 1000
     gid: 1000
-    exclude:
-      - tag: wallaby
-        test: nineth
-      - tag: xena
-        test: nineth
     jobs:
       - 'xtesting-opnfv-xtesting-{tag}-{test}-run'
 
@@ -545,10 +516,6 @@
           dependency: 3.16
       - yoga:
           dependency: 3.16
-      - xena:
-          dependency: 3.14
-      - wallaby:
-          dependency: 3.13
 
 - project:
     name: 'xtesting-dep-pull'