Adding Ubuntu 19.04 desktop

ruzickap · May 16, 2019 · b04b639 · b04b639
1 parent 3ca0019
commit b04b639
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -155,7 +155,7 @@ with Packer.
 ./build.sh ubuntu-{18.04,16.04,14.04}-server-amd64-{libvirt,virtualbox}
 
 # Ubuntu Desktop
-./build.sh ubuntu-18.10-desktop-amd64-{libvirt,virtualbox}
+./build.sh ubuntu-19.04-desktop-amd64-{libvirt,virtualbox}
 
 # Ubuntu Server - customized
 ./build.sh my_ubuntu-{18.04,16.04,14.04}-server-amd64-{libvirt,virtualbox}
@@ -242,11 +242,11 @@ UBUNTU_TYPE="server" PACKER_IMAGES_OUTPUT_DIR="/var/tmp/" \
 packer build -only="qemu" ubuntu-server.json
 
 # Ubuntu Desktop
-NAME="ubuntu-18.10-desktop-amd64" UBUNTU_CODENAME="cosmic" \
+NAME="ubuntu-19.04-desktop-amd64" UBUNTU_CODENAME="disco" \
 UBUNTU_TYPE="desktop" PACKER_IMAGES_OUTPUT_DIR="/var/tmp/" \
 packer build -only="qemu" ubuntu-desktop.json
 
-NAME="ubuntu-18.04-desktop-amd64" UBUNTU_CODENAME="bionic" \
+NAME="ubuntu-18.10-desktop-amd64" UBUNTU_CODENAME="cosmic" \
 UBUNTU_TYPE="desktop" PACKER_IMAGES_OUTPUT_DIR="/var/tmp/" \
 packer build -only="qemu" ubuntu-desktop.json
 

diff --git a/build.sh b/build.sh
@@ -48,8 +48,8 @@ List of all supported builds:
  * windows-server-2019-standard-x64-eval-{libvirt,virtualbox}
  * windows-server-2016-standard-x64-eval-{libvirt,virtualbox}
  * windows-server-2012_r2-standard-x64-eval-{libvirt,virtualbox}
+ * ubuntu-19.04-desktop-amd64-{libvirt,virtualbox}
  * ubuntu-18.10-desktop-amd64-{libvirt,virtualbox}
- * ubuntu-18.04-desktop-amd64-{libvirt,virtualbox}
  * ubuntu-18.04-server-amd64-{libvirt,virtualbox}
  * ubuntu-16.04-server-amd64-{libvirt,virtualbox}
  * ubuntu-14.04-server-amd64-{libvirt,virtualbox}
@@ -121,7 +121,7 @@ cmdline() {
       *ubuntu*)
         export UBUNTU_TYPE=`echo $NAME | awk -F '-' '{ print $3 }'`
         export UBUNTU_VERSION=`echo $NAME | awk -F '-' '{ print $2 }'`
-        export UBUNTU_CODENAME=`curl -s http://releases.ubuntu.com/ | sed -n "s@^<li><a href=\"\(.*\)/\">Ubuntu ${UBUNTU_VERSION}.*@\1@p" | head -1`
+        export UBUNTU_CODENAME=`curl -s http://releases.ubuntu.com/ | sed -n "s@.*<a href=\"\([a-z]*\)/\">.*Ubuntu ${UBUNTU_VERSION}.*@\1@p" | head -1`
         export PACKER_FILE="${MY_NAME}-${UBUNTU_TYPE}.json"
         export DOCKER_ENV_PARAMETERS="-e UBUNTU_TYPE -e UBUNTU_VERSION -e UBUNTU_CODENAME -e NAME"
         echo "* NAME: $NAME, UBUNTU_TYPE: $UBUNTU_TYPE, UBUNTU_CODENAME: $UBUNTU_CODENAME, PACKER_FILE: $PACKER_FILE"

diff --git a/tools/build_all.sh b/tools/build_all.sh
@@ -8,7 +8,7 @@ LOGFILE="/tmp/build_all.log"
 (
 
   for PACKER_VAGRANT_PROVIDER in libvirt virtualbox; do
-    for BUILD in ubuntu-{18.10,18.04}-desktop-amd64 ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-{18.04,16.04}-server-amd64 my_centos-7-x86_64 my_windows-10-enterprise-x64-eval windows-{server-{2019,2016,2012_r2}-standard,10-enterprise}-x64-eval; do
+    for BUILD in ubuntu-{19.04,18.10}-desktop-amd64 ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-{18.04,16.04}-server-amd64 my_centos-7-x86_64 my_windows-10-enterprise-x64-eval windows-{server-{2019,2016,2012_r2}-standard,10-enterprise}-x64-eval; do
       echo "**** `date`"
       ./build.sh ${BUILD}-${PACKER_VAGRANT_PROVIDER}
     done

diff --git a/ubuntu-desktop.json b/ubuntu-desktop.json
@@ -1,4 +1,5 @@
 {
+  "_comment": "NAME=ubuntu-19.04-desktop-amd64 UBUNTU_CODENAME=disco  PACKER_IMAGES_OUTPUT_DIR=/var/tmp/ packer build -only=qemu ubuntu-desktop.json",
   "_comment": "NAME=ubuntu-18.10-desktop-amd64 UBUNTU_CODENAME=cosmic PACKER_IMAGES_OUTPUT_DIR=/var/tmp/ packer build -only=qemu ubuntu-desktop.json",
   "_comment": "NAME=ubuntu-18.04-desktop-amd64 UBUNTU_CODENAME=bionic PACKER_IMAGES_OUTPUT_DIR=/var/tmp/ packer build -only=qemu ubuntu-desktop.json",
   "_comment": "NAME=ubuntu-16.04-desktop-amd64 UBUNTU_CODENAME=xenial PACKER_IMAGES_OUTPUT_DIR=/var/tmp/ packer build -only=qemu ubuntu-desktop.json",

diff --git a/upload_box_to_vagrantup.sh b/upload_box_to_vagrantup.sh
@@ -27,8 +27,8 @@ Box names with user:
 * [email protected]
 * [email protected]
 * [email protected]
+* [email protected]
 * [email protected]
-* [email protected]
 * [email protected]
 * [email protected]
 * peru@my_windows-10-enterprise-x64-eval-libvirt.box
@@ -152,7 +152,12 @@ upload_boxfile_to_vagrantup() {
   local UPLOAD_PATH=$(curl -sS https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$BOX_VERSION/provider/$VAGRANT_PROVIDER/upload?access_token=$VAGRANTUP_ACCESS_TOKEN | jq -r '.upload_path')
   echo "*** Uploading \"${VAGRANT_CLOUD_BOX_FILE}\" to \"https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME\" as version [$BOX_VERSION]"
   curl -s -X PUT --upload-file ${VAGRANT_CLOUD_BOX_FILE} $UPLOAD_PATH
-  curl -s https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$BOX_VERSION/release -X PUT -d access_token="$VAGRANTUP_ACCESS_TOKEN" -o /dev/null
+
+  if ! curl -s --output /dev/null  https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$BOX_VERSION/release -X PUT -d access_token="$VAGRANTUP_ACCESS_TOKEN"; then
+    echo -e "\nUpload failed !\nOne more try..."
+    curl -s --output /dev/null https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$BOX_VERSION/release -X PUT -d access_token="$VAGRANTUP_ACCESS_TOKEN"
+  fi
+
   # Check if uploaded file really exists
   if curl --output /dev/null --silent --head --fail "https://app.vagrantup.com/$VAGRANT_CLOUD_USER/boxes/$NAME/versions/$BOX_VERSION/providers/$VAGRANT_PROVIDER.box"; then
     echo "*** File \"https://vagrantcloud.com/$VAGRANT_CLOUD_USER/boxes/$NAME/versions/$BOX_VERSION/providers/$VAGRANT_PROVIDER.box\" is reachable and exists..."