From: Dongsu Park <dongsu.park@profitbricks.com>
Date: Tue, 14 Jan 2014 12:16:18 +0000 (+0100)
Subject: extract_storage: support for a new format of DISTRIBUTION variable
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=6c43d08f289ac7c8bbb2d4d88e9fbab0a8914ce9;p=profitbricks%2Fjenkins-build-scripts.git

extract_storage: support for a new format of DISTRIBUTION variable

since several months, this script has not been able to support for
building feature branch kernels any more. It looks like $DISTRIBUTION
is now being given with a format of "dev_feature_$branchname".

To fix errors of Jenkins job dev-feature_extract-storage-kernel-and
-modules, let's make it support for dev_feature_$branchname" too.
---

diff --git a/extract_storage_kernel+modules.sh b/extract_storage_kernel+modules.sh
index 3696aa9..d1e71c1 100755
--- a/extract_storage_kernel+modules.sh
+++ b/extract_storage_kernel+modules.sh
@@ -51,7 +51,7 @@ case $DISTRIBUTION in
 	> /etc/apt/sources.list.d/profitbricks-linux-image-storage-$TARGET_NAME.list
 	"
         ;;
-  experimental)
+  experimental|dev_feature*)
 	[ -n "$PB_SUITE" ] && export TARGET_NAME=$PB_SUITE || export TARGET_NAME="experimental"
 	LAST_DEVELOP_BUILD_NO=$(get_last_target_build_no develop)
 	BUILD_NUMBER="$LAST_DEVELOP_BUILD_NO.$(printf %03d $BUILD_NUMBER)"
@@ -65,7 +65,8 @@ case $DISTRIBUTION in
 	"
         ;;
   *)
-	echo "DISTRIBUTION must be 'production-proposed-updates', 'pre-staging', or 'experimental'."
+	echo "DISTRIBUTION must be 'production-proposed-updates', 'pre-staging', 'experimental',"
+	echo "or 'dev_feature*'"
 	echo "exiting."
 	figlet "FAIL"
 	exit 1