From a67786b44aaa5518caaf941309607b1461bf662c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 6 May 2020 18:59:00 +0200 Subject: Run K8s cnf at the end MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit K8s vIMS sometimes fails then it would allow verifying security in all cases. Change-Id: Ie2544c6ba7eb87361c26f813af7f70c682d51e7f Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes.yaml | 30 +++++++++++++++--------------- 1 file 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 @@ -436,11 +436,6 @@ <<: *functest-kubernetes-jobs - 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: @@ -448,6 +443,11 @@ <<: *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 - multijob: name: dump all campaign data projects: @@ -634,11 +634,6 @@ <<: *functest-kubernetes-jobs - 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: @@ -646,6 +641,11 @@ <<: *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 @@ -745,11 +745,6 @@ <<: *functest-kubernetes-jobs - 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: @@ -757,6 +752,11 @@ <<: *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' -- cgit