Merge "Increase timeout of libvirt build to 120"

diff --git a/jjb/iec/iec-compass-build.sh b/jjb/iec/iec-compass-build.sh
index e604dfc..de560a6 100755 (executable)
--- a/jjb/iec/iec-compass-build.sh
+++ b/jjb/iec/iec-compass-build.sh
@@ -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,6 +35,11 @@ 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

diff --git a/jjb/iec/iec-fuel-deploy.sh b/jjb/iec/iec-fuel-deploy.sh
index 069c685..e7ecb1e 100644 (file)
--- a/jjb/iec/iec-fuel-deploy.sh
+++ b/jjb/iec/iec-fuel-deploy.sh
@@ -16,7 +16,7 @@ export TMPDIR=${HOME}/tmpdir
 if [ "$(uname -m)" = 'aarch64' ]; then
     LAB_NAME='arm'
     # shellcheck disable=SC2153
-    POD_NAME=${NODE_NAME/*ubuntu1604-dev-48c-256g-/virtual}
+    POD_NAME=${NODE_NAME/*ubuntu1804-dev-48c-256g-/virtual}
 else
     echo "Unavailable hardware. Cannot continue!"
     exit 1

diff --git a/jjb/shell/ta-iso-deploy.sh b/jjb/shell/ta-iso-deploy.sh
index 705ac3c..e40eeba 100644 (file)
--- a/jjb/shell/ta-iso-deploy.sh
+++ b/jjb/shell/ta-iso-deploy.sh
@@ -19,11 +19,11 @@ set -x  # Trace commands for this script to make debugging easier.
 set +f  # Ensure filename expansion (globbing) is enabled
 
 NEXUS_REPO=images-snapshots
-release_path=TA/release-1
+release_path=TA/images/${JOB_NAME##*-}
 
 repo_dir="$WORKSPACE/work/nexus/$NEXUS_REPO"
-upload_dir1="$repo_dir/$release_path/images/$BUILD_ID"
-upload_dir2="$repo_dir/$release_path/images/latest"
+upload_dir1="$repo_dir/$release_path/$BUILD_ID"
+upload_dir2="$repo_dir/$release_path/latest"
 nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
 
 mkdir -p "$upload_dir1"
@@ -43,6 +43,7 @@ cp "$WORKSPACE/work/results/images/"* "$upload_dir2"
 
 echo "-----> Upload ISOs to Nexus"
 lftools deploy nexus "$nexus_repo_url" "$repo_dir"
+rm -rf "$repo_dir"
 
 set +x  # Disable trace since we no longer need it.
 echo "ISOs location: <a href=\"$nexus_repo_url\">$nexus_repo_url</a>"