From 58e0638bb2f7e5b45449098eb0b981be5d9143c7 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 29 Jan 2013 11:14:22 +1100
Subject: [PATCH] Remove the create-tarball.sh script.

We don't need this anymore, it was there to handle the milestone code.

Change-Id: Ie9b75fbeebd568d6d6fd47510a5083f26f214281
Reviewed-on: https://review.openstack.org/20660
Reviewed-by: Chuck Short <chuck.short@canonical.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 .../files/slave_scripts/create-tarball.sh     | 69 -------------------
 .../jenkins_job_builder/config/macros.yaml    | 11 ++-
 2 files changed, 10 insertions(+), 70 deletions(-)
 delete mode 100755 modules/jenkins/files/slave_scripts/create-tarball.sh

diff --git a/modules/jenkins/files/slave_scripts/create-tarball.sh b/modules/jenkins/files/slave_scripts/create-tarball.sh
deleted file mode 100755
index 51458f93a3..0000000000
--- a/modules/jenkins/files/slave_scripts/create-tarball.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash -xe
-
-# In case we start doing something more sophisticated with other refs
-# later (such as tags).
-BRANCH=$ZUUL_REF
-BRANCH_PATH=`echo $BRANCH | tr / -`
-META_URL="https://review.openstack.org/p"
-
-if [ $BRANCH == "milestone-proposed" ]
-then
-    REVNOPREFIX="r"
-fi
-
-if [ -z "$1" ]
-then
-    echo '$1 not set.'
-    exit 1
-fi
-PROJECT=$1
-
-find_next_version() {
-    datestamp="${datestamp:-$(date +%Y%m%d)}"
-    if [[ $BRANCH =~ ^stable/.*$ ]]
-    then
-        milestonever=""
-    else
-        milestonever="$(git show meta/openstack/release:${BRANCH})"
-        if [ $? != 0 ]
-        then
-            echo "Milestone file ${BRANCH} not found. Bailing out." >&2
-            exit 1
-        fi
-    fi
-
-    version="$milestonever"
-    if [ -n "$version" ]
-    then
-        version="${version}~"
-    fi
-    revno="${revno:-$(git log --oneline |  wc -l)}"
-    version="$(printf %s%s.%s%d "$version" "$datestamp" "$REVNOPREFIX" "$revno")"
-    printf "%s" "$version"
-}
-
-
-git fetch $META_URL/$ZUUL_PROJECT +refs/meta/*:refs/remotes/meta/*
-rm -f dist/*.tar.gz
-if [ -f setup.py ] ; then
-    tox -evenv python setup.py sdist
-    # There should only be one, so this should be safe.
-    tarball=$(echo dist/*.tar.gz)
-    # If our tarball includes a versioninfo file, use that version
-    snapshotversion=`tar --wildcards -O -z -xf $tarball *versioninfo 2>/dev/null || true`
-    if [ "x${snapshotversion}" = "x" ] ; then
-        snapshotversion=$(find_next_version)
-        echo mv "$tarball" "dist/$(basename $tarball .tar.gz)~${snapshotversion}.tar.gz"
-        mv "$tarball" "dist/$(basename $tarball .tar.gz)~${snapshotversion}.tar.gz"
-        cp "dist/$(basename $tarball .tar.gz)~${snapshotversion}.tar.gz" "dist/${PROJECT}-${BRANCH_PATH}.tar.gz"
-    elif [ "$tarball" != "dist/${PROJECT}-${snapshotversion}.tar.gz" ] ; then
-        echo mv "$tarball" "dist/${PROJECT}-${snapshotversion}.tar.gz"
-        mv "$tarball" "dist/${PROJECT}-${snapshotversion}.tar.gz"
-        cp "dist/${PROJECT}-${snapshotversion}.tar.gz" "dist/${PROJECT}-${BRANCH_PATH}.tar.gz"
-    fi
-fi
-
-echo "SHA1sum: "
-sha1sum dist/*
-echo "MD5sum: "
-md5sum dist/*
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index af384596d4..acc2c37581 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -116,7 +116,16 @@
 - builder:
     name: tarball
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/create-tarball.sh {project}"
+      - shell: |
+          #!/bin/bash -xe
+
+          rm -f dist/*.tar.gz
+          tox -evenv python setup.py sdist
+
+          echo "SHA1sum: "
+          sha1sum dist/*
+          echo "MD5sum: "
+          md5sum dist/*
 
 - builder:
     name: devstack-checkout