Add xtesting-mts in Xtesting gates

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

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index f2b3dac..433a6ee 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -62,6 +62,8 @@
     name: 'xtesting-run-containers'
     <<: *xtesting-containers
     test: '{test}'
+    privileged: '{privileged}'
+    network: '{network}'
 
 - builder:
     name: xtesting-pull-containers
@@ -91,6 +93,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -170,6 +174,13 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'xtesting-opnfv-xtesting-mts-pull'
+    <<: *xtesting-params
+    container: 'xtesting-mts'
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-pull'
+
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-rmi'
     parameters:
@@ -186,6 +197,13 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'xtesting-opnfv-xtesting-mts-rmi'
+    <<: *xtesting-params
+    container: 'xtesting-mts'
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-rmi'
+
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
     parameters:
@@ -215,9 +233,30 @@
         test: sixth
       - tag: iruya
         test: sixth
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'xtesting-opnfv-xtesting-mts'
+    <<: *xtesting-params
+    container: 'xtesting-mts'
+    test:
+      - seventh
+    exclude:
+      - tag: hunter
+        test: seventh
+      - tag: iruya
+        test: seventh
+      - tag: jerma
+        test: seventh
+      - tag: kali
+        test: seventh
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
 - builder:
     name: xtesting-zip
@@ -288,11 +327,15 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
+              <<: *xtesting-jobs
       - multijob:
           name: pull containers
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-pull'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-pull'
+              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -308,6 +351,11 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts:{tag}
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+              <<: *xtesting-jobs
       - multijob:
           name: dump all campaign data
           projects:
@@ -367,7 +415,17 @@
     <<: *xtesting-params
     container: xtesting
     ref_arg: BRANCH
-    path: docker
+    path: docker/core
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-gate'
+      - 'xtesting-{repo}-{container}-{tag}-check'
+
+- project:
+    name: xtesting-opnfv-xtesting-mts-{tag}-build
+    <<: *xtesting-params
+    container: xtesting-mts
+    ref_arg: BRANCH
+    path: docker/mts
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-gate'
       - 'xtesting-{repo}-{container}-{tag}-check'
@@ -396,6 +454,8 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
+              <<: *xtesting-jobs
       - multijob:
           name: remove dependencies
           projects:
@@ -411,6 +471,11 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-check'
               <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-check'
+              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -426,6 +491,11 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts:{tag}
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+              <<: *xtesting-jobs
 
 - trigger:
     name: xtesting-patchset-created
@@ -475,6 +545,8 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
+              <<: *xtesting-jobs
       - multijob:
           name: remove dependencies
           projects:
@@ -490,6 +562,11 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-gate'
               <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-gate'
+              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -505,6 +582,11 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts:{tag}
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+              <<: *xtesting-jobs
 
 - project:
     name: 'xtesting'