From d93d4ecc487d592aac50379c07b44b8a8bd824e3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 4 Sep 2020 15:51:23 +0200 Subject: Add cnf_conformance in all master jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3a91a6731889fba06a255b86564de04ceb6efcd1 Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes-pi.yaml | 33 ++++++++++++++++++++++++++++++++ jjb/functest/functest-kubernetes.yaml | 26 +++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml index f33d028f3..bfc682487 100644 --- a/jjb/functest/functest-kubernetes-pi.yaml +++ b/jjb/functest/functest-kubernetes-pi.yaml @@ -342,6 +342,37 @@ container: 'functest-kubernetes-cnf' test: - k8s_vims + exclude: + - tag: kali + test: cnf_conformance + - tag: jerma + test: cnf_conformance + - tag: iruya + test: cnf_conformance + - tag: hunter + test: cnf_conformance + - tag: arm-latest + test: cnf_conformance + - tag: arm-kali + test: cnf_conformance + - tag: arm-jerma + test: cnf_conformance + - tag: arm-iruya + test: cnf_conformance + - tag: arm-hunter + test: cnf_conformance + - tag: arm64-latest + test: cnf_conformance + - tag: arm64-kali + test: cnf_conformance + - tag: arm64-kali + test: cnf_conformance + - tag: arm64-jerma + test: cnf_conformance + - tag: arm64-iruya + test: cnf_conformance + - tag: arm64-hunter + test: cnf_conformance privileged: 'false' network: bridge jobs: @@ -471,6 +502,8 @@ - multijob: name: ollivier/functest-kubernetes-cnf:{tag} projects: + - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run' + <<: *functest-kubernetes-pi-jobs - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run' <<: *functest-kubernetes-pi-jobs - multijob: diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index a96ba32cd..be4dc8ba6 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -335,7 +335,27 @@ <<: *functest-kubernetes-params container: 'functest-kubernetes-cnf' test: + - cnf_conformance - k8s_vims + exclude: + - tag: kali + test: cnf_conformance + - tag: jerma + test: cnf_conformance + - tag: iruya + test: cnf_conformance + - tag: hunter + test: cnf_conformance + - tag: arm64-latest + test: cnf_conformance + - tag: arm64-kali + test: cnf_conformance + - tag: arm64-jerma + test: cnf_conformance + - tag: arm64-iruya + test: cnf_conformance + - tag: arm64-hunter + test: cnf_conformance privileged: 'false' network: bridge jobs: @@ -465,6 +485,8 @@ - multijob: name: opnfv/functest-kubernetes-cnf:{tag} projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run' <<: *functest-kubernetes-jobs - multijob: @@ -724,6 +746,8 @@ - multijob: name: opnfv/functest-kubernetes-cnf:{tag} projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run' <<: *functest-kubernetes-jobs @@ -846,6 +870,8 @@ - multijob: name: opnfv/functest-kubernetes-cnf:{tag} projects: + - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run' <<: *functest-kubernetes-jobs -- cgit 1.2.3-korg