X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=a894b0a284be1c309738fae786aba79e4f8b1679;hb=fc29e71adbed054b577addba5df7ef269342bca3;hp=b84003fdcb9d144666482587e031b5f23e30a5ff;hpb=35163698b65f78e532b373c03e6b1871addf5d1e;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index b84003fdc..a894b0a28 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -13,35 +13,42 @@
     tag:
       - latest:
           from:
-          buildargs:
+          build_args:
           branch: master
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
           dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
       - wallaby:
           from:
-          buildargs:
+          build_args:
           branch: stable/wallaby
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
       - leguer:
           from:
-          buildargs:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
           dependency: 3.12
       - kali:
           from:
-          buildargs:
+          build_args:
           branch: stable/kali
           slave: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
           dependency: 3.11
       - jerma:
           from:
-          buildargs:
+          build_args:
           branch: stable/jerma
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
@@ -85,13 +92,6 @@
           name: IMAGE_PROPERTIES
           default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 
-- parameter:
-    name: functest-DEBUG
-    parameters:
-      - string:
-          name: DEBUG
-          default: 'true'
-
 - functest-run-containers: &functest-run-containers
     name: 'functest-run-containers'
     <<: *functest-containers
@@ -123,12 +123,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
-          echo "{env}"
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+            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
@@ -138,7 +139,6 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          echo $env
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
@@ -285,8 +285,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -301,7 +299,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-healthcheck'
     test:
       - connection_check
@@ -335,8 +332,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -351,7 +346,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-smoke'
     test:
       - tempest_neutron
@@ -387,6 +381,14 @@
         test: networking-sfc
       - tag: latest
         test: patrole
+      - tag: xena
+        test: refstack_defcore
+      - tag: xena
+        test: networking-bgpvpn
+      - tag: xena
+        test: networking-sfc
+      - tag: xena
+        test: patrole
       - tag: wallaby
         test: refstack_defcore
       - tag: wallaby
@@ -445,8 +447,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -461,7 +461,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-smoke-cntt'
     test:
       - tempest_neutron_cntt
@@ -490,8 +489,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -506,7 +503,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-benchmarking'
     test:
       - rally_full
@@ -531,8 +527,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -547,7 +541,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-benchmarking-cntt'
     test:
       - rally_full_cntt
@@ -570,8 +563,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -586,7 +577,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-vnf'
     test:
       - cloudify
@@ -606,11 +596,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -646,8 +638,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-zip:
           <<: *functest-containers
@@ -664,7 +654,6 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
-      - DEBUG=$DEBUG
     container: 'functest-healthcheck'
     jobs:
       - 'functest-{tag}-zip'
@@ -685,8 +674,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
@@ -881,7 +868,7 @@
     <<: *functest-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -897,8 +884,9 @@
             image={repo}:{port}/{container}:{tag}
           fi
           build_args=""
-          if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs}"
+          if [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
           fi
           if [ "{ref_arg}" != "None" ]; then
             build_args="$build_args --build-arg {ref_arg}={ref}"
@@ -990,7 +978,9 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          sudo apt-get update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
           apt-get install software-properties-common gpg -y
           sudo add-apt-repository -y ppa:deadsnakes/ppa
           sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
@@ -1035,7 +1025,7 @@
       - functest-build-containers:
           <<: *functest-build-containers
           ref: $GERRIT_REFSPEC
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
 
 - project:
     name: functest-opnfv-functest-core-{tag}-gate
@@ -1054,6 +1044,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'xena'}
       - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
@@ -1149,8 +1140,6 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
-      - functest-DEBUG:
-          DEBUG: 'true'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
@@ -1402,7 +1391,7 @@
       - functest-build-containers:
           <<: *functest-build-containers
           ref: '{branch}'
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
       - functest-push-containers:
           <<: *functest-build-containers
           ref: '{branch}'
@@ -1424,6 +1413,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'xena'}
       - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}