Merge "Increase timeout of libvirt build to 120"

[ci-management.git] / jjb / iec / iec-compass-build.sh

diff --git a/jjb/iec/iec-compass-build.sh b/jjb/iec/iec-compass-build.sh
index 3a5e2d8..de560a6 100755 (executable)
--- a/jjb/iec/iec-compass-build.sh
+++ b/jjb/iec/iec-compass-build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 check_env(){
   #Checking python-pip software status. If failed, reinstall it.
@@ -22,6 +22,12 @@ check_env(){
   fi
 }
 
+checkout_arm64(){
+  VERSION="dcc6d07"
+  git checkout ${VERSION}
+  sed -i 's:opnfv/:cyb70289/:' build/build-aarch64.yaml
+}
+
 check_env
 
 echo "begin build compass"
@@ -29,15 +35,23 @@ git clone https://github.com/opnfv/compass4nfv.git
 
 cd compass4nfv
 
+if [ "$(uname -m)" = 'aarch64' ]; then
+  echo "Checkout compass4nfv to Arm64 version"
+  checkout_arm64
+fi
+
 COMPASS_WORK_DIR=$WORKSPACE/../compass-work
 
 mkdir -p $COMPASS_WORK_DIR
 ln -s $COMPASS_WORK_DIR work
 
-sudo docker rm -f `docker ps | grep compass | cut -f1 -d' '` || true
+sudo docker rm -f `sudo docker ps | grep compass | cut -f1 -d' '` || true
 
-curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true
+curl -sL http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true
 
 ./build.sh
 
+# Fix permissions so we can archive log files before pushing to Nexus
+sudo chown $(id -u):$(id -g) -R "${WORKSPACE}"
+
 exit 0