Adding back ubuntu-18.04-desktop-amd64

ruzickap · Feb 6, 2020 · 2e17be6 · 2e17be6
1 parent d6374f7
commit 2e17be6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,6 +51,7 @@ jobs:
           - ubuntu-16.04-server-amd64-libvirt
           - ubuntu-18.04-server-amd64-libvirt
           # - ubuntu-19.10-desktop-amd64-libvirt
+          - ubuntu-18.04-desktop-amd64-libvirt
           - my_windows-10-enterprise-x64-eval-libvirt
           - windows-10-enterprise-x64-eval-libvirt
           - windows-server-2016-standard-x64-eval-libvirt
@@ -109,6 +110,7 @@ jobs:
           - ubuntu-16.04-server-amd64-virtualbox
           - ubuntu-18.04-server-amd64-virtualbox
           # - ubuntu-19.10-desktop-amd64-virtualbox
+          - ubuntu-18.04-desktop-amd64-virtualbox
           - my_windows-10-enterprise-x64-eval-virtualbox
           - windows-10-enterprise-x64-eval-virtualbox
           - windows-server-2016-standard-x64-eval-virtualbox
@@ -151,12 +153,19 @@ jobs:
       - name: Check the boxes at app.vagrantup.com
         run: |
           # for NAME in ubuntu-19.10-desktop-amd64 ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-18.04-server-amd64 my_centos-7-x86_64 my_windows-10-enterprise-x64-eval windows-{server-{{2016,2012_r2}-standard,2019-datacenter},10-enterprise}-x64-eval; do
-          for NAME in ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-18.04-server-amd64 my_centos-7-x86_64 my_windows-10-enterprise-x64-eval windows-{server-{{2016,2012_r2}-standard,2019-datacenter},10-enterprise}-x64-eval; do
+          for NAME in ubuntu-18.04-desktop-amd64 ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-18.04-server-amd64 my_centos-7-x86_64 my_windows-10-enterprise-x64-eval windows-{server-{{2016,2012_r2}-standard,2019-datacenter},10-enterprise}-x64-eval; do
             for VAGRANT_PROVIDER in virtualbox libvirt; do
               CURRENT_VERSION=$(curl -s https://app.vagrantup.com/api/v1/box/peru/$NAME | jq -r ".current_version.version")
               URL="https://app.vagrantup.com/peru/boxes/$NAME/versions/$CURRENT_VERSION/providers/$VAGRANT_PROVIDER.box"
               echo "*** $URL"
-              curl -L --fail --silent --head --output /dev/null "$URL" || ( echo "* Failed... ^^^" && exit 1 )
+              if ! curl -L --fail --silent --head --output /dev/null "$URL"; then
+                echo "* URL \"$URL\" is not accessible !"
+                exit 1
+              fi
+              if [ $(curl -s https://app.vagrantup.com/peru/boxes/$NAME | jq '.versions | length') != "1" ]; then
+                echo "* Too many versions for: https://app.vagrantup.com/peru/boxes/$NAME !"
+                exit 2
+              fi
             done
           done
 

diff --git a/README.md b/README.md
@@ -159,7 +159,7 @@ Real examples can be found here: [https://gitlab.com/ruzickap/packer-templates/p
 ./build.sh ubuntu-{18.04,16.04,14.04}-server-amd64-{libvirt,virtualbox}
 
 # Ubuntu Desktop
-./build.sh ubuntu-19.10-desktop-amd64-{libvirt,virtualbox}
+./build.sh ubuntu-{19.10,18.04}-desktop-amd64-{libvirt,virtualbox}
 
 # Ubuntu Server - customized
 ./build.sh my_ubuntu-{18.04,16.04,14.04}-server-amd64-{libvirt,virtualbox}

diff --git a/build.sh b/build.sh
@@ -47,6 +47,7 @@ List of all supported builds:
  * windows-server-2016-standard-x64-eval-{libvirt,virtualbox}
  * windows-server-2012_r2-standard-x64-eval-{libvirt,virtualbox}
  * ubuntu-19.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}

diff --git a/tools/build_all.sh b/tools/build_all.sh
@@ -8,7 +8,7 @@ LOGFILE="/tmp/build_all.log"
 (
   cd ..
   for PACKER_VAGRANT_PROVIDER in libvirt virtualbox; do
-    for BUILD in ubuntu-19.10-desktop-amd64 ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-18.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.10,18.04}-desktop-amd64 ubuntu-{18.04,16.04,14.04}-server-amd64 my_ubuntu-18.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/upload_box_to_vagrantup.sh b/upload_box_to_vagrantup.sh
@@ -28,6 +28,7 @@ Box names with user:
 * [email protected]
 * [email protected]
 * [email protected]
+* [email protected]
 * [email protected]
 * [email protected]
 * peru@my_windows-10-enterprise-x64-eval-libvirt.box