-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}