Replace RELENG_ by v for poudriere to make vol name shorter

2 files changed, 10 insertions, 8 deletions

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index abe4379..759a1fc 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1864,7 +1864,7 @@ pkg_repo_rsync() {
 }
 
 poudriere_create_patch() {
-	local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch"
+	local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch"
 
 	if [ -z "${FREEBSD_PARENT_BRANCH}" ]; then
 		echo ">>> ERROR: FREEBSD_PARENT_BRANCH is not set"
@@ -1938,7 +1938,7 @@ poudriere_jail_name() {
 	fi
 
 	# Remove arch
-	echo "${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${_jail_arch##*.}"
+	echo "${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${_jail_arch##*.}"
 }
 
 poudriere_rename_ports() {
@@ -2027,7 +2027,7 @@ poudriere_create_ports_tree() {
 poudriere_init() {
 	local _error=0
 	local _archs=$(poudriere_possible_archs)
-	local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch"
+	local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch"
 
 	LOGFILE=${BUILDER_LOGS}/poudriere.log
 
@@ -2159,7 +2159,7 @@ EOF
 
 poudriere_update_jails() {
 	local _archs=$(poudriere_possible_archs)
-	local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch"
+	local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch"
 
 	LOGFILE=${BUILDER_LOGS}/poudriere.log
 
@@ -2251,7 +2251,7 @@ poudriere_bulk() {
 			_ref_bulk="${POUDRIERE_BULK}"
 		fi
 
-		_bulk=${SCRATCHDIR}/poudriere_bulk.${GIT_REPO_BRANCH_OR_TAG}
+		_bulk=${SCRATCHDIR}/poudriere_bulk.${POUDRIERE_BRANCH}
 		sed -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" ${_ref_bulk} > ${_bulk}
 
 		if ! poudriere bulk -f ${_bulk} -j ${jail_name} -p ${POUDRIERE_PORTS_NAME}; then
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 9e4a00f..b8f4bb6 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -135,6 +135,8 @@ if [ "${_cur_git_repo_branch_or_tag}" = "HEAD" ]; then
 else
 	export GIT_REPO_BRANCH_OR_TAG="${_cur_git_repo_branch_or_tag}"
 fi
+# Use vX_Y instead of RELENG_X_Y for poudriere to make it shorter
+POUDRIERE_BRANCH=$(echo "${GIT_REPO_BRANCH_OR_TAG}" | sed 's,RELENG_,v,')
 
 GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e 's,/[^/]*$,,')
 
@@ -262,7 +264,7 @@ echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE
 # Poudriere
 export ZFS_TANK=${ZFS_TANK:-"zroot"}
 export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"}
-export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"}
+export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${POUDRIERE_BRANCH}"}
 
 export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk"}
 export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"}
@@ -274,7 +276,7 @@ export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"}
 export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"}
 export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"}
 export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"}
-export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"}
+export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${POUDRIERE_BRANCH}"}
 
 # Command used to sign pkg repo
 export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""}
@@ -305,7 +307,7 @@ esac
 
 # Define base package version, based on date for snaps
 export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}"
-export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET_ARCH}-core"}
+export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"}
 export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}"
 export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"}