Revert "CI: Rename global-settings to mvn-glob..."

[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..09dd66e 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.
@@ -20,24 +20,32 @@ check_env(){
     rm get-pip.py
     hash -r
   fi
+
+  # Clean environment
+  sudo docker rm -f `sudo docker ps | grep compass | cut -f1 -d' '` || true
 }
 
-check_env
+build_compass(){
 
-echo "begin build compass"
-git clone https://github.com/opnfv/compass4nfv.git
+  echo "Clone compass4nfv"
+  git clone -b CompassinAkrainoIEC https://github.com/iecedge/compass4nfv.git
 
-cd compass4nfv
+  cd compass4nfv
 
-COMPASS_WORK_DIR=$WORKSPACE/../compass-work
+  COMPASS_WORK_DIR=$WORKSPACE/../compass-work
 
-mkdir -p $COMPASS_WORK_DIR
-ln -s $COMPASS_WORK_DIR work
+  mkdir -p $COMPASS_WORK_DIR
+  ln -snf $COMPASS_WORK_DIR work
 
-sudo docker rm -f `docker ps | grep compass | cut -f1 -d' '` || true
+  ./build.sh
+}
+
+check_env
 
-curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true
+# Build compass
+build_compass
 
-./build.sh
+# Fix permissions so we can archive log files before pushing to Nexus
+sudo chown $(id -u):$(id -g) -R "${WORKSPACE}"
 
 exit 0