From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 17 Mar 2020 16:29:48 +0000 (+0000)
Subject: Merge "Fix installation bug on Ubuntu 18.04"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=7b25bf09560b931ed6db3337d84751236c3bc8af;hp=94fade00a59bad93684e419cb5fd12261d0fbd2f

Merge "Fix installation bug on Ubuntu 18.04"
---

diff --git a/jjb/iec/iec-compass-build.sh b/jjb/iec/iec-compass-build.sh
index de560a6..09dd66e 100755
--- a/jjb/iec/iec-compass-build.sh
+++ b/jjb/iec/iec-compass-build.sh
@@ -20,36 +20,30 @@ check_env(){
     rm get-pip.py
     hash -r
   fi
-}
 
-checkout_arm64(){
-  VERSION="dcc6d07"
-  git checkout ${VERSION}
-  sed -i 's:opnfv/:cyb70289/:' build/build-aarch64.yaml
+  # Clean environment
+  sudo docker rm -f `sudo docker ps | grep compass | cut -f1 -d' '` || true
 }
 
-check_env
-
-echo "begin build compass"
-git clone https://github.com/opnfv/compass4nfv.git
+build_compass(){
 
-cd compass4nfv
+  echo "Clone compass4nfv"
+  git clone -b CompassinAkrainoIEC https://github.com/iecedge/compass4nfv.git
 
-if [ "$(uname -m)" = 'aarch64' ]; then
-  echo "Checkout compass4nfv to Arm64 version"
-  checkout_arm64
-fi
+  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 `sudo docker ps | grep compass | cut -f1 -d' '` || true
+  ./build.sh
+}
 
-curl -sL http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true
+check_env
 
-./build.sh
+# Build compass
+build_compass
 
 # Fix permissions so we can archive log files before pushing to Nexus
 sudo chown $(id -u):$(id -g) -R "${WORKSPACE}"