Add xrally_kubernetes_full in all gates

Change-Id: I7a3747acbe241d70550883002d690c3d2c848288
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 4df9eef..627d55f 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -196,6 +196,13 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-pi-params
@@ -239,6 +246,13 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-pi-params
@@ -323,6 +337,17 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    test:
+      - xrally_kubernetes_full
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
     <<: *functest-kubernetes-pi-params
@@ -414,6 +439,8 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
@@ -425,6 +452,8 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
@@ -446,6 +475,11 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench-run'
               <<: *functest-kubernetes-pi-jobs
+      - multijob:
+          name: ollivier/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index db5c500..8295627 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -211,6 +211,13 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-params
@@ -248,6 +255,13 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-params
@@ -326,6 +340,17 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    test:
+      - xrally_kubernetes_full
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
     <<: *functest-kubernetes-params
@@ -417,6 +442,8 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -428,6 +455,8 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -449,6 +478,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -600,6 +634,22 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-benchmarking
+    ref_arg:
+    path: docker/benchmarking
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
+
 - job-template:
     name: 'functest-kubernetes-{tag}-check'
     project-type: multijob
@@ -630,6 +680,8 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -661,6 +713,11 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: build opnfv/functest-kubernetes-benchmarking
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-check'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -673,6 +730,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-security:{tag}
           projects:
@@ -740,6 +802,8 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -771,6 +835,11 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: build opnfv/functest-kubernetes-benchmarking
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -790,6 +859,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects: