From 4010d8077a564b678dac835eb8cf9c583b4ad25d Mon Sep 17 00:00:00 2001 From: iberezovskiy Date: Tue, 5 Jul 2016 15:49:17 +0300 Subject: [PATCH] Add ability to override Murano hook var's Change-Id: I941f5c876acca3f062a0532410c406be766291cb --- functions.sh | 3 ++- pre_build_hook | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/functions.sh b/functions.sh index a017554..4c0d8b9 100644 --- a/functions.sh +++ b/functions.sh @@ -24,6 +24,7 @@ DEB_REPO="${ROOT}"/repositories/ubuntu/ function download_package { local package_type=$1 local url=$2 + local wget_lvl=${3:-4} if [[ "$package_type" == 'deb' ]]; then REPO=$DEB_REPO elif [[ "$package_type" == 'rpm' ]]; then @@ -32,7 +33,7 @@ function download_package { echo "Invalid package type: $1" fi - wget -P "$REPO" -A "$package_type" -nd -r -l 1 "$url" + wget -P "$REPO" -A "$package_type" -nd -r -l ${wget_lvl} "$url" } # Download official Puppet module and store it in the local directory diff --git a/pre_build_hook b/pre_build_hook index 37b64ba..bf2401d 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -3,11 +3,17 @@ set -eux . "$(dirname "$(readlink -f "$0")")"/functions.sh -MURANO_REF="stable/mitaka" -MURANO_PACKAGE_RELEASE='9.0' -MURANO_TARBALL_URL="https://github.com/openstack/puppet-murano/archive/${MURANO_REF}.tar.gz" -MURANO_PACKAGE_URL="http://mirror.fuel-infra.org/mos-repos/ubuntu/${MURANO_PACKAGE_RELEASE}/pool/main/m/murano/" +MURANO_REF=${MURANO_REF:-'stable/mitaka'} +MURANO_PACKAGE_RELEASE=${MURANO_PACKAGE_RELEASE:-'9.0'} +MURANO_TARBALL_URL=${MURANO_TARBALL_URL:-"https://github.com/openstack/puppet-murano/archive/${MURANO_REF}.tar.gz"} -download_package 'deb' ${MURANO_PACKAGE_URL} +# Add murano packages and some dependencies +MURANO_PACKAGES_URLS_DEFAULT="http://mirror.fuel-infra.org/extras/murano-plugin-repos/ubuntu/${MURANO_PACKAGE_RELEASE}/pool/main/" + +MURANO_PACKAGES_URLS=${MURANO_PACKAGES_URLS:-${MURANO_PACKAGES_URLS_DEFAULT}} + +for url in ${MURANO_PACKAGES_URLS}; do + download_package 'deb' "${url}" +done download_puppet_module "murano" ${MURANO_TARBALL_URL}