summaryrefslogtreecommitdiffstats
path: root/jjb/functest/functest-kubernetes.yaml
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-05-06 18:59:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-05-06 18:59:46 +0200
commita67786b44aaa5518caaf941309607b1461bf662c (patch)
treeaa2106dd036503f75d7b53ebb1a7ad8afe78612e /jjb/functest/functest-kubernetes.yaml
parentd0345337962d1ee45609feda57e64603f146c696 (diff)
Run K8s cnf at the end
K8s vIMS sometimes fails then it would allow verifying security in all cases. Change-Id: Ie2544c6ba7eb87361c26f813af7f70c682d51e7f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest-kubernetes.yaml')
-rw-r--r--jjb/functest/functest-kubernetes.yaml30
1 files changed, 15 insertions, 15 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index ff8196978..e7d1870c3 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -437,11 +437,6 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
<<: *functest-kubernetes-jobs
- multijob:
- name: opnfv/functest-kubernetes-cnf:{tag}
- projects:
- - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
- <<: *functest-kubernetes-jobs
- - multijob:
name: opnfv/functest-kubernetes-security:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
@@ -449,6 +444,11 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
- multijob:
+ name: opnfv/functest-kubernetes-cnf:{tag}
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+ <<: *functest-kubernetes-jobs
+ - multijob:
name: dump all campaign data
projects:
- name: 'functest-kubernetes-{tag}-zip'
@@ -635,17 +635,17 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
<<: *functest-kubernetes-jobs
- multijob:
- name: opnfv/functest-kubernetes-cnf:{tag}
- projects:
- - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
- <<: *functest-kubernetes-jobs
- - multijob:
name: opnfv/functest-kubernetes-security:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
+ - multijob:
+ name: opnfv/functest-kubernetes-cnf:{tag}
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+ <<: *functest-kubernetes-jobs
- trigger:
name: functest-kubernetes-patchset-created
@@ -746,17 +746,17 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
<<: *functest-kubernetes-jobs
- multijob:
- name: opnfv/functest-kubernetes-cnf:{tag}
- projects:
- - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
- <<: *functest-kubernetes-jobs
- - multijob:
name: opnfv/functest-kubernetes-security:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
+ - multijob:
+ name: opnfv/functest-kubernetes-cnf:{tag}
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+ <<: *functest-kubernetes-jobs
- project:
name: 'functest-kubernetes'