TOOL-15610 Add flag to buildpkg to cause the build to use locally-built dependencies (#251)

Author: Paul Dagnelie

buildpkg.sh

@@ -39,6 +39,7 @@ function usage() {
 	echo "    -c  also run package's checkstyle hook."
 	echo "    -r  override default revision for package."
 	echo "    -h  display this message and exit."
+	echo "    -l  use locally-built dependencies instead of s3 versions."
 	echo ""
 	exit 2
 }
@@ -48,13 +49,15 @@ unset PARAM_PACKAGE_GIT_BRANCH
 unset PARAM_PACKAGE_REVISION
 
 do_checkstyle=false
-while getopts ':b:cg:hr:' c; do
+source="s3"
+while getopts ':b:cg:hlr:' c; do
 	case "$c" in
 	g) export PARAM_PACKAGE_GIT_URL="$OPTARG" ;;
 	b) export PARAM_PACKAGE_GIT_BRANCH="$OPTARG" ;;
 	r) export PARAM_PACKAGE_REVISION="$OPTARG" ;;
 	c) do_checkstyle=true ;;
 	h) usage >&2 ;;
+	l) source="local" ;;
 	*) usage "illegal option -- $OPTARG" >&2 ;;
 	esac
 done
@@ -86,7 +89,7 @@ logmust cd "$WORKDIR"
 stage fetch
 
 logmust cd "$WORKDIR"
-stage fetch_dependencies
+stage fetch_dependencies $source
 
 logmust cd "$WORKDIR"
 stage prepare

lib/common.sh

@@ -214,14 +214,15 @@ function check_git_ref() {
 #
 function stage() {
 	typeset hook=$1
+	shift 1
 
 	check_env PACKAGE
 	local stage_start=$SECONDS
 
 	echo ""
 	if type -t "$hook" >/dev/null; then
 		echo_bold "PACKAGE $PACKAGE: STAGE $hook STARTED"
-		logmust "$hook"
+		logmust "$hook" "$@"
 		echo_bold "PACKAGE $PACKAGE: STAGE $hook COMPLETED in" \
 			"$((SECONDS - stage_start)) seconds"
 	else
@@ -699,6 +700,7 @@ function get_package_dependency_s3_url() {
 # is defined in the package's config.
 #
 function fetch_dependencies() {
+	local source="$1"
 	export DEPDIR="$WORKDIR/dependencies"
 	logmust mkdir "$DEPDIR"
 	logmust cd "$DEPDIR"
@@ -712,22 +714,35 @@ function fetch_dependencies() {
 	for dep in $PACKAGE_DEPENDENCIES; do
 		echo "Fetching artifacts for dependency '$dep' ..."
 		get_package_prefix "$dep"
-		s3urlvar="${_RET}_S3_URL"
-		if [[ -n "${!s3urlvar}" ]]; then
-			s3url="${!s3urlvar}"
-			echo "S3 URL of package dependency '$dep' provided" \
-				"externally"
-			echo "$s3urlvar=$s3url"
-		else
-			logmust get_package_dependency_s3_url "$dep"
-			s3url="$_RET"
-		fi
-		[[ "$s3url" != */ ]] && s3url="$s3url/"
-		logmust mkdir "$dep"
-		logmust aws s3 ls "$s3url"
-		logmust aws s3 cp --only-show-errors --recursive "$s3url" "$dep/"
-		echo_bold "Fetched artifacts for '$dep' from $s3url"
-		PACKAGE_DEPENDENCIES_METADATA="${PACKAGE_DEPENDENCIES_METADATA}$dep: $s3url\\n"
+		case "$source" in
+		"local")
+			logmust cp -r "$WORKDIR/../../$dep/tmp/artifacts/" \
+			    "$dep/"
+			;;
+		"s3")
+			s3urlvar="${_RET}_S3_URL"
+			if [[ -n "${!s3urlvar}" ]]; then
+				s3url="${!s3urlvar}"
+				echo "S3 URL of package dependency '$dep' " \
+				    "provided externally"
+				echo "$s3urlvar=$s3url"
+			else
+				logmust get_package_dependency_s3_url "$dep"
+				s3url="$_RET"
+			fi
+			[[ "$s3url" != */ ]] && s3url="$s3url/"
+			logmust mkdir "$dep"
+			logmust aws s3 ls "$s3url"
+			logmust aws s3 cp --only-show-errors --recursive \
+			    "$s3url" "$dep/"
+			echo_bold "Fetched artifacts for '$dep' from $s3url"
+			PACKAGE_DEPENDENCIES_METADATA="" \
+			    "${PACKAGE_DEPENDENCIES_METADATA}$dep: $s3url\\n"
+			;;
+		*)
+			die "invalid source parameter specified: '$source'"
+			;;
+		esac
 	done
 }