summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest')
-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'