]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
extract_storage_kernel+modules.sh: Fix sources.list for experimental distribution
authorBenjamin Drung <benjamin.drung@profitbricks.com>
Wed, 19 Nov 2014 15:12:31 +0000 (16:12 +0100)
committerBenjamin Drung <benjamin.drung@profitbricks.com>
Wed, 19 Nov 2014 15:12:31 +0000 (16:12 +0100)
extract_storage_kernel+modules.sh

index 4d5cb66461248148b368bcefbf6508bc16e9c369..85119d6ce395a05835efec4f0b4099f4cc3a7061 100755 (executable)
@@ -52,7 +52,7 @@ case $DISTRIBUTION in
        "
         ;;
   experimental|dev_feature*)
-       [ -n "$PB_SUITE" ] && export TARGET_NAME=$PB_SUITE || export TARGET_NAME="experimental"
+       [ -n "$PB_SUITE" ] && export TARGET_NAME=$(echo $PB_SUITE | sed 's/^dev_feature_/squeeze-feature-/') || export TARGET_NAME="experimental"
        LAST_DEVELOP_BUILD_NO=$(get_last_target_build_no develop)
        BUILD_NUMBER="$LAST_DEVELOP_BUILD_NO.$(printf %03d $BUILD_NUMBER)"
 
@@ -61,9 +61,9 @@ case $DISTRIBUTION in
        # the pre-staging distribution, because ANDBD modules must have not
        # been built into packages under a particular distribution.
        FEATURE_APTCMD="
-       echo \"deb http://repo.pb.local/pb-debian-dev $TARGET_NAME main contrib non-free\" \
+       echo \"deb http://repo.pb.local/pb-debian-dev ${DIST}-dev main contrib non-free\" \
        > /etc/apt/sources.list.d/profitbricks-linux-image-storage-$TARGET_NAME.list ; \
-       echo \"deb http://repo.pb.local/pb-debian-dev ${DISTRO}-dev main contrib non-free\" \
+       echo \"deb http://repo.pb.local/pb-debian-dev $TARGET_NAME main contrib non-free\" \
        > /etc/apt/sources.list.d/profitbricks-linux-image-storage-develop.list
        "
        FEATURE_VERSCMD="