Merge lp:~daniel-thewatkins/vmbuilder/jenkins_kvm-vagrantcloud into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Dan Watkins]

[Robert C Jennings (rcj)]

+1

review: Approve

[Francis Ginther (fginther)]

Approve

review: Approve

=== modified file 'register-vagrant-version.sh'
--- register-vagrant-version.sh	2016-03-23 09:14:35 +0000
+++ register-vagrant-version.sh	2017-06-28 19:27:56 +0000
@@ -2,7 +2,7 @@
 
 set -eu
 
-API_ROOT="https://atlas.hashicorp.com/api/v1"
+API_ROOT="https://vagrantcloud.com/api/v1"
 BOX_OWNER=${BOX_OWNER:-"ubuntu"}
 
 SUITE="$1"
@@ -14,7 +14,7 @@
 # Always point to the current image, so we don't run in to a problem with
 # versions being removed in the future
 case $SUITE in
-    precise|trusty|wily)
+    trusty)
         BOX_URL_PREFIX="http://cloud-images.ubuntu.com/vagrant/${SUITE}/current/${SUITE}-server-cloudimg-${ARCH}"
         BOX_URL_POSTFIX="-vagrant-disk1.box"
         ;;
@@ -56,10 +56,10 @@
 
 make_api_call () {
     echo "Making API call:" $@
-    curl -f $@ -d "access_token=${ACCESS_TOKEN}" | python -m json.tool
+    curl -L -f $@ -d "access_token=${ACCESS_TOKEN}" | python -m json.tool
 }
 
-if curl -f "${API_ROOT}/box/${BOX_OWNER}/${BOX_NAME}"; then
+if curl -L -f "${API_ROOT}/box/${BOX_OWNER}/${BOX_NAME}"; then
     echo "Box ${BOX_NAME} already registered..."
 else
     echo "Registering ${BOX_NAME}..."
@@ -76,7 +76,7 @@
 
 echo "Check if the version already registered..."
 while true; do
-    if curl -f "${API_ROOT}/box/${BOX_OWNER}/${BOX_NAME}/version/${VERSION}"; then
+    if curl -L -f "${API_ROOT}/box/${BOX_OWNER}/${BOX_NAME}/version/${VERSION}"; then
         echo "Version ${VERSION} already registered; trying a higher revision."
         VERSION="$(echo "$VERSION" | awk -F. -v OFS=. '{printf("%s.%s.%s\n", $1, $2, ++$3)}')"
     else