From 6a81a90d6a4a468418bee6d513ce23227f99a5fd Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Fri, 8 Jan 2016 14:33:56 +0100 Subject: [PATCH] Use stable/8.0 branch for fuel-library modules There are many changes between 7.0 and stable/8.0 and it is safer to base our work on stable/8.0. Eventually we'll switch to the 8.0 tag once it is available. Change-Id: I14b2ba16c8d173210cb50ce8018d9edb53c3635d --- pre_build_hook | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pre_build_hook b/pre_build_hook index d8c4063d..460fd475 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -9,7 +9,8 @@ STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4 INIFILE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-inifile-1.4.1.tar.gz" LVM_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-lvm-0.5.0.tar.gz" GRAFANA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/bfraser-grafana-2.1.0.tar.gz" -FUEL_LIB_COMMIT="7.0" +# TODO(pasquier-s): use the 8.0 tag when it's available +FUEL_LIB_COMMIT="stable/8.0" FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz" download_package https://s3.amazonaws.com/influxdb/influxdb_0.9.6.1_amd64.deb @@ -28,4 +29,6 @@ download_puppet_module "lvm" "$LVM_TARBALL_URL" rm -rf "${MODULES_DIR:?}"/l23network wget -qO- "${FUEL_LIB_TARBALL_URL}" | \ tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \ - fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/l23network + fuel-library-${FUEL_LIB_COMMIT/\//-}/deployment/puppet/l23network +# Remove this dead link otherwise fpb fails +rm -f "${MODULES_DIR:?}"/osnailyfacter/modular/master