Fix DASHBOARD_URL if Xena Gates

[releng.git] / jjb / functest / functest-pi.yaml

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 663810c..ba8a3d0 100644 (file)
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -14,6 +14,9 @@
       - latest:
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
+      - xena:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
       - wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
@@ -29,6 +32,9 @@
       - arm-latest:
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
+      - xena-latest:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
       - arm-wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
@@ -44,6 +50,9 @@
       - arm64-latest:
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
+      - arm64-xena:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
       - arm64-wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
@@ -124,8 +133,16 @@
     builders:
       - shell: |
           set +x
-          volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
-          env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          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}
@@ -376,6 +393,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
@@ -426,6 +451,14 @@
         test: networking-sfc
       - tag: arm-latest
         test: patrole
+      - tag: arm-xena
+        test: refstack_defcore
+      - tag: arm-xena
+        test: networking-bgpvpn
+      - tag: arm-xena
+        test: networking-sfc
+      - tag: arm-xena
+        test: patrole
       - tag: arm-wallaby
         test: refstack_defcore
       - tag: arm-wallaby
@@ -476,6 +509,14 @@
         test: networking-sfc
       - tag: arm64-latest
         test: patrole
+      - tag: arm64-xena
+        test: refstack_defcore
+      - tag: arm64-xena
+        test: networking-bgpvpn
+      - tag: arm64-xena
+        test: networking-sfc
+      - tag: arm64-xena
+        test: patrole
       - tag: arm64-wallaby
         test: refstack_defcore
       - tag: arm64-wallaby
@@ -681,8 +722,16 @@
     builders:
       - shell: |
           set +x
-          volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
-          env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          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}