From 749b7499246004e31560bb370a0e901ff265fd5a Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Fri, 29 Jun 2018 13:49:44 -0500 Subject: [PATCH] pkglib: Make default alpha We should point to alpha to allow test scripts. Signed-off-by: Jose Carlos Venegas Munoz --- obs-packaging/scripts/pkglib.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/obs-packaging/scripts/pkglib.sh b/obs-packaging/scripts/pkglib.sh index 4911800fb..b00a5d354 100644 --- a/obs-packaging/scripts/pkglib.sh +++ b/obs-packaging/scripts/pkglib.sh @@ -9,7 +9,7 @@ LOG_DIR=${PACKAGING_DIR}/build_logs # OBS Project info OBS_PROJECT="${OBS_PROJECT:-katacontainers}" -OBS_SUBPROJECT="${OBS_SUBPROJECT:-release}" +OBS_SUBPROJECT="${OBS_SUBPROJECT:-alpha}" # BUILD OPTIONS BUILD_DISTROS=${BUILD_DISTROS:-Fedora_27 xUbuntu_16.04 CentOS_7} @@ -35,10 +35,10 @@ fi function display_help() { - cat <<-EOL + cat <<-EOL $SCRIPT_NAME - This script is intended to create Kata Containers 3.X packages for the OBS + This script is intended to create Kata Containers packages for the OBS (Open Build Service) platform. Usage: @@ -89,7 +89,7 @@ function verify() # Make sure this script is called from ./ [ "$SCRIPT_DIR" != "." ] && die "The script must be called from its base dir." - + # Verify if osc is installed, exit otherwise. [ ! -x "$(command -v osc)" ] && die "osc is not installed." @@ -131,7 +131,7 @@ function set_versions() else hash_tag=$commit_hash fi - short_hashtag="${hash_tag:0:7}" + short_hashtag="${hash_tag:0:7}" } function changelog_update { @@ -190,7 +190,6 @@ function checkout_repo() cp ${STATIC_FILES[@]} $OBS_WORKDIR } - function obs_push() { pushd $OBS_WORKDIR @@ -258,7 +257,7 @@ function generate_files () { replace_list+=("RPM_PATCH_LIST=$RPM_PATCH_LIST") replace_list+=("RPM_APPLY_PATCHES=$RPM_APPLY_PATCHES") - # check replace list + # check replace list # key=val for replace in "${replace_list[@]}" ; do [[ "$replace" = *"="* ]] || die "invalid replace $replace" @@ -322,7 +321,6 @@ function get_obs_pkg_release() { release=$(grep -oP '%define\s+release\s+[0-9]+' "${spec_file}" | grep -oP '[0-9]+') fi - rm -r "${repo_dir}" echo "${release}" }