From 9aac45a0fe0313c0bfe9d913165a03fc9f495e0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 3 Apr 2021 12:28:05 +0200 Subject: [PATCH] Add k8s_conformance_serial in gates MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: If3471e9b881a7e79ac2781dd00ba9d89fa0aced7 Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes-pi.yaml | 24 ++++++++++++++++++------ jjb/functest/functest-kubernetes.yaml | 8 ++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml index 8bc4cc086..d4d9738a2 100644 --- a/jjb/functest/functest-kubernetes-pi.yaml +++ b/jjb/functest/functest-kubernetes-pi.yaml @@ -14,9 +14,9 @@ - latest: slave: lf-virtual1-6 - leguer: - slave: lf-virtual1-5 + slave: functest_k8s_leguer - kali: - slave: lf-virtual1-4 + slave: functest_k8s_kali - jerma: slave: lf-virtual1-3 - iruya: @@ -26,9 +26,9 @@ - arm-latest: slave: lf-virtual1-6 - arm-leguer: - slave: lf-virtual1-5 + slave: functest_k8s_leguer - arm-kali: - slave: lf-virtual1-4 + slave: functest_k8s_kali - arm-jerma: slave: lf-virtual1-3 - arm-iruya: @@ -38,9 +38,9 @@ - arm64-latest: slave: lf-virtual1-6 - arm64-leguer: - slave: lf-virtual1-5 + slave: functest_k8s_leguer - arm64-kali: - slave: lf-virtual1-4 + slave: functest_k8s_kali - arm64-jerma: slave: lf-virtual1-3 - arm64-iruya: @@ -256,6 +256,7 @@ test: - xrally_kubernetes - k8s_conformance + - k8s_conformance_serial - sig_api_machinery - sig_apps - sig_auth @@ -269,6 +270,7 @@ privileged: 'false' network: bridge exclude: + - {'tag': 'jerma', 'test': 'k8s_conformance_serial'} - {'tag': 'jerma', 'test': 'sig_api_machinery'} - {'tag': 'jerma', 'test': 'sig_apps'} - {'tag': 'jerma', 'test': 'sig_auth'} @@ -279,6 +281,7 @@ - {'tag': 'jerma', 'test': 'sig_network_features'} - {'tag': 'jerma', 'test': 'sig_node'} - {'tag': 'jerma', 'test': 'sig_storage'} + - {'tag': 'iruya', 'test': 'k8s_conformance_serial'} - {'tag': 'iruya', 'test': 'sig_api_machinery'} - {'tag': 'iruya', 'test': 'sig_apps'} - {'tag': 'iruya', 'test': 'sig_auth'} @@ -289,6 +292,7 @@ - {'tag': 'iruya', 'test': 'sig_network_features'} - {'tag': 'iruya', 'test': 'sig_node'} - {'tag': 'iruya', 'test': 'sig_storage'} + - {'tag': 'hunter', 'test': 'k8s_conformance_serial'} - {'tag': 'hunter', 'test': 'sig_api_machinery'} - {'tag': 'hunter', 'test': 'sig_apps'} - {'tag': 'hunter', 'test': 'sig_auth'} @@ -299,6 +303,7 @@ - {'tag': 'hunter', 'test': 'sig_network_features'} - {'tag': 'hunter', 'test': 'sig_node'} - {'tag': 'hunter', 'test': 'sig_storage'} + - {'tag': 'arm-jerma', 'test': 'k8s_conformance_serial'} - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'} - {'tag': 'arm-jerma', 'test': 'sig_apps'} - {'tag': 'arm-jerma', 'test': 'sig_auth'} @@ -309,6 +314,7 @@ - {'tag': 'arm-jerma', 'test': 'sig_network_features'} - {'tag': 'arm-jerma', 'test': 'sig_node'} - {'tag': 'arm-jerma', 'test': 'sig_storage'} + - {'tag': 'arm-iruya', 'test': 'k8s_conformance_serial'} - {'tag': 'arm-iruya', 'test': 'sig_api_machinery'} - {'tag': 'arm-iruya', 'test': 'sig_apps'} - {'tag': 'arm-iruya', 'test': 'sig_auth'} @@ -319,6 +325,7 @@ - {'tag': 'arm-iruya', 'test': 'sig_network_features'} - {'tag': 'arm-iruya', 'test': 'sig_node'} - {'tag': 'arm-iruya', 'test': 'sig_storage'} + - {'tag': 'arm-hunter', 'test': 'k8s_conformance_serial'} - {'tag': 'arm-hunter', 'test': 'sig_api_machinery'} - {'tag': 'arm-hunter', 'test': 'sig_apps'} - {'tag': 'arm-hunter', 'test': 'sig_auth'} @@ -329,6 +336,7 @@ - {'tag': 'arm-hunter', 'test': 'sig_network_features'} - {'tag': 'arm-hunter', 'test': 'sig_node'} - {'tag': 'arm-hunter', 'test': 'sig_storage'} + - {'tag': 'arm64-jerma', 'test': 'k8s_conformance_serial'} - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'} - {'tag': 'arm64-jerma', 'test': 'sig_apps'} - {'tag': 'arm64-jerma', 'test': 'sig_auth'} @@ -339,6 +347,7 @@ - {'tag': 'arm64-jerma', 'test': 'sig_network_features'} - {'tag': 'arm64-jerma', 'test': 'sig_node'} - {'tag': 'arm64-jerma', 'test': 'sig_storage'} + - {'tag': 'arm64-iruya', 'test': 'k8s_conformance_serial'} - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery'} - {'tag': 'arm64-iruya', 'test': 'sig_apps'} - {'tag': 'arm64-iruya', 'test': 'sig_auth'} @@ -349,6 +358,7 @@ - {'tag': 'arm64-iruya', 'test': 'sig_network_features'} - {'tag': 'arm64-iruya', 'test': 'sig_node'} - {'tag': 'arm64-iruya', 'test': 'sig_storage'} + - {'tag': 'arm64-hunter', 'test': 'k8s_conformance_serial'} - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery'} - {'tag': 'arm64-hunter', 'test': 'sig_apps'} - {'tag': 'arm64-hunter', 'test': 'sig_auth'} @@ -506,6 +516,8 @@ <<: *functest-kubernetes-pi-jobs - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-pi-jobs + - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run' + <<: *functest-kubernetes-pi-jobs - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_api_machinery-run' <<: *functest-kubernetes-pi-jobs - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_apps-run' diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 970f9469f..bd8ce618f 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -256,6 +256,7 @@ test: - xrally_kubernetes - k8s_conformance + - k8s_conformance_serial - sig_api_machinery - sig_apps - sig_auth @@ -269,6 +270,7 @@ privileged: 'false' network: bridge exclude: + - {'tag': 'jerma', 'test': 'k8s_conformance_serial'} - {'tag': 'jerma', 'test': 'sig_api_machinery'} - {'tag': 'jerma', 'test': 'sig_apps'} - {'tag': 'jerma', 'test': 'sig_auth'} @@ -279,6 +281,7 @@ - {'tag': 'jerma', 'test': 'sig_network_features'} - {'tag': 'jerma', 'test': 'sig_node'} - {'tag': 'jerma', 'test': 'sig_storage'} + - {'tag': 'iruya', 'test': 'k8s_conformance_serial'} - {'tag': 'iruya', 'test': 'sig_api_machinery'} - {'tag': 'iruya', 'test': 'sig_apps'} - {'tag': 'iruya', 'test': 'sig_auth'} @@ -289,6 +292,7 @@ - {'tag': 'iruya', 'test': 'sig_network_features'} - {'tag': 'iruya', 'test': 'sig_node'} - {'tag': 'iruya', 'test': 'sig_storage'} + - {'tag': 'hunter', 'test': 'k8s_conformance_serial'} - {'tag': 'hunter', 'test': 'sig_api_machinery'} - {'tag': 'hunter', 'test': 'sig_apps'} - {'tag': 'hunter', 'test': 'sig_auth'} @@ -446,6 +450,8 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_api_machinery-run' <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_apps-run' @@ -826,6 +832,8 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs + - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run' + <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_api_machinery-run' <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_apps-run' -- 2.16.6