From: Sebastian Riemer Date: Thu, 6 Jun 2013 14:35:45 +0000 (+0200) Subject: extract_storage: fix apt sources for master and develop X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=68dde6f8168d0650514391bb3c0d5d01af5dcc6a;p=profitbricks%2Fjenkins-build-scripts.git extract_storage: fix apt sources for master and develop The master build job 'extract-storage-kernel-and-modules' extracts the wrong sources. It takes the latest develop kernel as the apt sources for 'production-proposed-updates' are missing. So add the missing sources before installing the kernel and the out-of-tree modules. Fixes: DEVINF-379 --- diff --git a/extract_storage_kernel+modules.sh b/extract_storage_kernel+modules.sh index fdd6434..181f2eb 100755 --- a/extract_storage_kernel+modules.sh +++ b/extract_storage_kernel+modules.sh @@ -39,9 +39,17 @@ export PB_SUITE=$(echo $GIT_BRANCH_NAME | tr '/' '-' | sed -e "s/^\(feature\|bug case $DISTRIBUTION in production-proposed-updates) export TARGET_NAME=master + FEATURE_APTCMD=" + echo \"deb http://alexandria.pb.local/profitbricks-repository $DISTRIBUTION main contrib non-free\" \ + > /etc/apt/sources.list.d/profitbricks-linux-image-storage-$TARGET_NAME.list + " ;; pre-staging) export TARGET_NAME=develop + FEATURE_APTCMD=" + echo \"deb http://alexandria.pb.local/profitbricks-repository $DISTRIBUTION main contrib non-free\" \ + > /etc/apt/sources.list.d/profitbricks-linux-image-storage-$TARGET_NAME.list + " ;; experimental) [ -n "$PB_SUITE" ] && export TARGET_NAME=$PB_SUITE || export TARGET_NAME="master"