Merge ~chad.smith/cloud-init:fix-make-tarball into cloud-init:master

[Chad Smith]

tools: Fix make-tarball cli tool usage for development

This tool is used to assist during the creation of ubuntu packages for
release testing. Address the following on the command-line:
 * --help option now print usage
 * Add --orig-tarball which creates named output file
   cloud-init_<release-version>.orig.tar.gz
 * drop unused --verbose option

Nish ran into issues during cloud-init upload attempt.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:6ad734a83eec200b0033e6490861872fa990859e
https://jenkins.ubuntu.com/server/job/cloud-init-ci/975/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/975/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:6ad734a83eec200b0033e6490861872fa990859e
https://jenkins.ubuntu.com/server/job/cloud-init-ci/977/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/977/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

I don't really care for this change.
I'm not opposed to having a '--orig-tarball' flag or something.

but an upstream is not going to name their tarballs:
  package-version_orig.tar.gz

basically, my feeling is that the output name is correct for use as an upstream developer as it is. And if we change it as suggested, then its correct for debian development but odd for everything else.

review: Disapprove

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:199fd6a0d3c92be5d87ac77d487cd99730d6a1ca
https://jenkins.ubuntu.com/server/job/cloud-init-ci/989/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/989/rebuild

review: Needs Fixing (continuous-integration)

855df2c... by Chad Smith on 2018-04-11

tools: Fix make-tarball cli tool usage for development

This tool is used to assist during the creation of ubuntu packages for
release testing. Address the following on the command-line:
 * --help option now print usage
 * Add --orig-tarball which creates named output file
   cloud-init_<release-version>.orig.tar.gz
 * drop unused --verbose option

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:855df2c50906788a862f921102172f55d1b6e679
https://jenkins.ubuntu.com/server/job/cloud-init-ci/990/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/990/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

review: Approve

[Scott Moser (smoser)]

review: Approve

[Chad Smith (chad.smith)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=49b562c9

diff --git a/tools/make-tarball b/tools/make-tarball
index 3197689..8d54013 100755
--- a/tools/make-tarball
+++ b/tools/make-tarball
@@ -13,22 +13,28 @@ Usage: ${0##*/} [revision]
     create a tarball of revision (default HEAD)
 
     options:
-      -o | --output FILE   write to file
+      -h | --help		print usage
+      -o | --output FILE	write to file
+           --orig-tarball	Write file cloud-init_<version>.orig.tar.gz
+           --long		Use git describe --long for versioning
 EOF
 }
 
 short_opts="ho:v"
-long_opts="help,output:,long,verbose"
+long_opts="help,output:,orig-tarball,long"
 getopt_out=$(getopt --name "${0##*/}" \
     --options "${short_opts}" --long "${long_opts}" -- "$@") &&
     eval set -- "${getopt_out}" || { Usage 1>&2; exit 1; }
 
 long_opt=""
+orig_opt=""
 while [ $# -ne 0 ]; do
     cur=$1; next=$2
     case "$cur" in
+        -h|--help) Usage; exit 0;;
         -o|--output) output=$next; shift;;
            --long) long_opt="--long";;
+           --orig-tarball) orig_opt=".orig";;
         --) shift; break;;
     esac
     shift;
@@ -39,7 +45,10 @@ version=$(git describe --abbrev=8 "--match=[0-9]*" ${long_opt} $rev)
 
 archive_base="cloud-init-$version"
 if [ -z "$output" ]; then
-    output="$archive_base.tar.gz"
+    if [ ! -z "$orig_opt" ]; then
+        archive_base="cloud-init_$version"
+    fi
+    output="$archive_base$orig_opt.tar.gz"
 fi
 
 # when building an archiving from HEAD, ensure that there aren't any