Extend pre_build_hook options
* switch puppet module to git clone * add related variables Change-Id: I9951c3e6859322b90db6b837b9d65ea44977c9f4
This commit is contained in:
parent
08edf9379b
commit
f6295ebfba
12
functions.sh
12
functions.sh
|
@ -38,19 +38,23 @@ function download_package {
|
|||
|
||||
# Download official Puppet module and store it in the local directory
|
||||
function download_puppet_module {
|
||||
rm -rf "${MODULES_DIR:?}"/"$1"
|
||||
mkdir -p "${MODULES_DIR}"/"$1"
|
||||
wget -qO- "$2" | tar -C "${MODULES_DIR}/$1" --strip-components=1 -xz
|
||||
local m_dir=$1
|
||||
local git_repo=$2
|
||||
local git_branch=$3
|
||||
|
||||
rm -rvf "${MODULES_DIR:?}"/"$m_dir"
|
||||
git clone "${git_repo}" --single-branch -b "${git_branch}" "${MODULES_DIR}/${m_dir}"
|
||||
}
|
||||
|
||||
# Generate version file in format:
|
||||
# Build: $build_date
|
||||
# FUEL_PLUGIN_COMMIT=$sha
|
||||
# $pkg_name=$pkg_version
|
||||
function generate_version_file {
|
||||
function generate_deb_version_file {
|
||||
local version_file="${1:-build_version}"
|
||||
local tmp_file=$(mktemp)
|
||||
echo "# Build: $(date +%Y-%m-%d-%H-%M-%S)" >> "${version_file}"
|
||||
echo "FUEL_PLUGIN_REF=$(git rev-parse --abbrev-ref HEAD)" >> "${version_file}"
|
||||
echo "FUEL_PLUGIN_COMMIT=$(git rev-parse HEAD)" >> "${version_file}"
|
||||
while read -d '' -r pkg; do
|
||||
dpkg-deb -I "${pkg}"| awk '/Package:/{name=$2}/Version:/{ver=$2;print name"="ver}' >> "${tmp_file}"
|
||||
|
|
|
@ -4,12 +4,12 @@ set -eux
|
|||
. "$(dirname "$(readlink -f "$0")")"/functions.sh
|
||||
|
||||
VERSION_FILE="build_version"
|
||||
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"}
|
||||
|
||||
# Add murano packages and some dependencies, from master pkg's
|
||||
MURANO_PACKAGES_URLS_DEFAULT="http://mirror.fuel-infra.org/extras/murano-plugin-repos/ubuntu/${MURANO_PACKAGE_RELEASE}/pool/main/"
|
||||
# Describe version-depend variables:
|
||||
PUPPET_MURANO_REF=${MURANO_REF:-'stable/mitaka'}
|
||||
PUPPET_MURANO_GIT=${MURANO_REF:-'https://github.com/openstack/puppet-murano.git'}
|
||||
# Add murano packages and some dependencies, from master pkg's repo:
|
||||
MURANO_PACKAGES_URLS_DEFAULT="http://mirror.fuel-infra.org/extras/murano-plugin-repos/ubuntu/9.0/pool/main/"
|
||||
|
||||
MURANO_PACKAGES_URLS=${MURANO_PACKAGES_URLS:-${MURANO_PACKAGES_URLS_DEFAULT}}
|
||||
|
||||
|
@ -17,13 +17,12 @@ for url in ${MURANO_PACKAGES_URLS}; do
|
|||
download_package 'deb' "${url}"
|
||||
done
|
||||
|
||||
download_puppet_module "murano" ${MURANO_TARBALL_URL}
|
||||
download_puppet_module "murano" ${PUPPET_MURANO_GIT} ${PUPPET_MURANO_REF}
|
||||
|
||||
# generate general version file
|
||||
generate_version_file "${VERSION_FILE}"
|
||||
# generate deb version file
|
||||
generate_deb_version_file "${VERSION_FILE}"
|
||||
|
||||
# add info about MURANO_TARBALL
|
||||
echo "MURANO_TARBALL_URL=${MURANO_TARBALL_URL}" >> "${VERSION_FILE}"
|
||||
echo "MURANO_TARBALL_COMMIT=$(git ls-remote -h https://github.com/openstack/puppet-murano.git |grep "refs/heads/${MURANO_REF}" |awk '{print $1}' )" >> "${VERSION_FILE}"
|
||||
|
||||
|
||||
echo "PUPPET_MURANO_REF=${PUPPET_MURANO_REF}" >> "${VERSION_FILE}"
|
||||
echo "PUPPET_MURANO_GIT=${PUPPET_MURANO_GIT}" >> "${VERSION_FILE}"
|
||||
echo "PUPPET_MURANO_COMMIT=$(git ls-remote -h ${PUPPET_MURANO_GIT} |grep "refs/heads/${PUPPET_MURANO_REF}" |awk '{print $1}' )" >> "${VERSION_FILE}"
|
||||
|
|
Loading…
Reference in New Issue