X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting-pi.yaml;h=a935dcb76d711ee87936b780e9215eea988c3025;hb=9a9f20d715f5a890775748d6b8506369f2ce9fd7;hp=88ba74849504b7f5d4523597e4c98190ffac568c;hpb=da2c360e74aa1be43f1d760f7f28f8ffdb571a16;p=releng.git

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 88ba74849..a935dcb76 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -59,12 +59,13 @@
       - random-string:
           name: build_tag
 
-
 - xtesting-pi-run-containers: &xtesting-pi-run-containers
     name: 'xtesting-pi-run-containers'
     <<: *xtesting-pi-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
 
 - builder:
@@ -86,6 +87,14 @@
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -97,6 +106,8 @@
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
+            $volumes \
+            $env \
             -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 \
@@ -169,7 +180,7 @@
       - 'xtesting-pi-{repo}-{container}-{tag}-rmi'
 
 - job-template:
-    name: 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
+    name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
     parameters:
       - xtesting-pi-slave:
           slave: '{slave}'
@@ -182,6 +193,8 @@
 - project:
     name: 'xtesting-pi-ollivier-xtesting'
     <<: *xtesting-pi-params
+    volumes:
+    env:
     container: 'xtesting'
     test:
       - first
@@ -194,35 +207,64 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'leguer', 'test': 'eighth'}
-      - {'tag': 'kali', 'test': 'eighth'}
-      - {'tag': 'jerma', 'test': 'eighth'}
-      - {'tag': 'arm-leguer', 'test': 'eighth'}
-      - {'tag': 'arm-kali', 'test': 'eighth'}
-      - {'tag': 'arm-jerma', 'test': 'eighth'}
-      - {'tag': 'arm64-leguer', 'test': 'eighth'}
-      - {'tag': 'arm64-kali', 'test': 'eighth'}
-      - {'tag': 'arm64-jerma', 'test': 'eighth'}
+      - tag: leguer
+        test: eighth
+      - tag: kali
+        test: eighth
+      - tag: jerma
+        test: eighth
+      - tag: arm-leguer
+        test: eighth
+      - tag: arm-kali
+        test: eighth
+      - tag: arm-jerma
+        test: eighth
+      - tag: arm64-leguer
+        test: eighth
+      - tag: arm64-kali
+        test: eighth
+      - tag: arm64-jerma
+        test: eighth
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
+
+- job-template:
+    name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
+    parameters:
+      - xtesting-pi-slave:
+          slave: '{slave}'
+      - xtesting-pi-build_tag:
+          build_tag: ''
+    builders:
+      - xtesting-pi-run-containers:
+          <<: *xtesting-pi-run-containers
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting-mts'
     <<: *xtesting-pi-params
+    volumes:
+    env:
     container: 'xtesting-mts'
     test:
       - seventh
     privileged: 'false'
     network: bridge
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
-
+      - 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
 
 - builder:
     name: xtesting-pi-zip
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -232,6 +274,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
+            $volumes \
+            $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
@@ -252,10 +296,14 @@
     builders:
       - xtesting-pi-zip:
           <<: *xtesting-pi-containers
+          volumes: '{volumes}'
+          env: '{env}'
 
 - project:
     name: 'xtesting-pi-{tag}-zip'
     <<: *xtesting-pi-params
+    volumes:
+    env:
     container: 'xtesting'
     jobs:
       - 'xtesting-pi-{tag}-zip'
@@ -270,12 +318,14 @@
           slave: '{slave}'
       - xtesting-pi-build_tag:
           build_tag: ''
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-pi-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images