From 2ab55fb24923cf53def787e118d4d53079c9f784 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 2 May 2016 10:30:39 -0400 Subject: [PATCH] Update puppet logic for run-tarball.sh Here we are making sure our tarballs that we produce are named puppet-foo.tar.gz. Additionally, we don't need to rename tagged tarballs, since puppet build module does the right thing. Change-Id: Ib16327fe436e5dd84c773be19892f3eca4a09f55 Signed-off-by: Paul Belanger --- jenkins/scripts/run-tarball.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jenkins/scripts/run-tarball.sh b/jenkins/scripts/run-tarball.sh index e90205f0aa..171b2921c4 100755 --- a/jenkins/scripts/run-tarball.sh +++ b/jenkins/scripts/run-tarball.sh @@ -21,8 +21,17 @@ if [ -r metadata.json ]; then # or puppet-aodh-tarball and not puppet-aodh. MODULE_NAME=$(basename `git rev-parse --show-toplevel` | sed "s/\(-branch\)\?-tarball$//") puppet module build . + # NOTE(pabelanger): Here we are converting openstack-neutron-8.0.0.tar.gz to + # puppet-neutron-8.0.0.tar.gz. + find . -name openstack-*.tar.gz | sed -e "p;s/openstack-/puppet-/" | xargs -n2 mv mkdir -p dist - mv pkg/*.tar.gz dist/$MODULE_NAME.tar.gz + if echo $ZUUL_REFNAME | grep refs/tags/ >/dev/null ; then + # NOTE(pabelanger) We don't need to rename tagged tarballs as `puppet + # module build` does the right thing. + mv pkg/*.tar.gz dist/ + else + mv pkg/*.tar.gz dist/$MODULE_NAME.tar.gz + fi else # this a python project venv=${1:-venv}