Merge "leverage token_check only when posting results"

[releng.git] / jjb / apex / apex-build.sh

diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh
index b6b2f21..23ce810 100755 (executable)
--- a/jjb/apex/apex-build.sh
+++ b/jjb/apex/apex-build.sh
@@ -9,8 +9,9 @@ echo
 # create the cache directory if it doesn't exist
 [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
 # set OPNFV_ARTIFACT_VERSION
-if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
-  export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
+if echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then
+  GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$')
+  export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
   export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY"
 elif echo $BUILD_TAG | grep "csit" 1> /dev/null; then
   export OPNFV_ARTIFACT_VERSION=csit${BUILD_NUMBER}
@@ -23,9 +24,15 @@ else
   export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
 fi
 
+# Temporary hack until we fix apex build script
+BUILD_DIRECTORY=${WORKSPACE}/build
+
 # start the build
-cd $WORKSPACE/ci
-./build.sh $BUILD_ARGS
+pushd ${BUILD_DIRECTORY}
+make clean
+popd
+export PYTHONPATH=${WORKSPACE}
+python3 apex/build.py $BUILD_ARGS
 RPM_VERSION=$(grep Version: $WORKSPACE/build/rpm_specs/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
 # list the contents of BUILD_OUTPUT directory
 echo "Build Directory is ${BUILD_DIRECTORY}/../.build"
@@ -39,7 +46,7 @@ echo "Cache Directory Contents:"
 echo "-------------------------"
 ls -al $CACHE_DIRECTORY
 
-if ! echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+if ! echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then
   echo "Writing opnfv.properties file"
   # save information regarding artifact into file
   (