feat: add ubuntu 24.04 lts

- Adds Ubuntu Server 24.04 LTS to the project. - Removes Ubuntu Server 23.10 from the project; superseded by 24.04 LTS. Signed-off-by: Ryan Johnson <[email protected]>
vmware-samples · Apr 22, 2024 · 47d88e0 · 47d88e0
1 parent 395980e
commit 47d88e0
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 42 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -75,11 +75,11 @@ Debian-11:
 
 ##############################################################################
 
-Ubuntu-Server-23.10:
+Ubuntu-Server-24.04-LTS:
     extends: .packer-build
     variables:
-        INPUT_PATH: "$SCRIPT_PATH/builds/linux/ubuntu/23-10/"
-        BUILD_VARS: "linux-ubuntu-23-10.pkrvars.hcl"
+        INPUT_PATH: "$SCRIPT_PATH/builds/linux/ubuntu/24-04-lts/"
+        BUILD_VARS: "linux-ubuntu-24-04-lts.pkrvars.hcl"
         EXTRA_VAR_FILES: "-var-file=$CONFIG_PATH/network.pkrvars.hcl -var-file=$CONFIG_PATH/linux-storage.pkrvars.hcl"
 
 ##############################################################################

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,13 +6,20 @@
 
 **Enhancement**:
 
+- Adds Ubuntu Server 24.04 LTS to the project.
+  [#xxx](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/xxx)
 - Adds a script (`./download.sh`) and a configuration (`project.json`) to assist in the download of
   the guest operating systems.
   [#874](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/874),
   [#877](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/877)
 - Adds option to enable cloud-init on Debian 12.5.
   [#883](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/883)
 
+Chore:
+
+- Removes Ubuntu Server 23.10 from the project; superseded by 24.04 LTS.
+  [#xxx](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/xxx)
+
 ## v0.19.1
 
 > Release Date: 2024-04-15

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ This project supports the following guest operating systems:
 | VMware Photon OS             | 4         |
 | Debian                       | 12        |
 | Debian                       | 11        |
-| Ubuntu Server                | 23.10     |
+| Ubuntu Server                | 24.04 LTS |
 | Ubuntu Server                | 22.04 LTS |
 | Ubuntu Server                | 20.04 LTS |
 | Red Hat Enterprise Linux     | 9         |

diff --git a/build.sh b/build.sh
@@ -204,19 +204,19 @@ menu_option_4() {
 }
 
 menu_option_5() {
-  INPUT_PATH="$SCRIPT_PATH"/builds/linux/ubuntu/23-10/
+  INPUT_PATH="$SCRIPT_PATH"/builds/linux/ubuntu/24-04-lts/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
 
-  echo -e "\nCONFIRM: Build a Ubuntu Server 23.10 Template for VMware vSphere?"
+  echo -e "\nCONFIRM: Build a Ubuntu Server 24.04 LTS Template for VMware vSphere?"
   echo -e "\nContinue? (y/n)"
   read -r REPLY
   if [[ ! $REPLY =~ ^[Yy]$ ]]; then
     exit 1
   fi
 
-  ### Build a Ubuntu Server 23.10 Template for VMware vSphere. ###
-  echo "Building a Ubuntu Server 23.10 Template for VMware vSphere..."
+  ### Build a Ubuntu Server 24.04 LTS Template for VMware vSphere. ###
+  echo "Building a Ubuntu Server 24.04 LTS Template for VMware vSphere..."
 
   ### Initialize HashiCorp Packer and required plugins. ###
   echo "Initializing HashiCorp Packer and required plugins..."
@@ -1363,7 +1363,7 @@ until [ "$selection" = "0" ]; do
   echo "    	 2  -  VMware Photon OS 4"
   echo "    	 3  -  Debian 12"
   echo "    	 4  -  Debian 11"
-  echo "    	 5  -  Ubuntu Server 23.10"
+  echo "    	 5  -  Ubuntu Server 24.04 LTS"
   echo "    	 6  -  Ubuntu Server 22.04 LTS"
   echo "    	 7  -  Ubuntu Server 20.04 LTS"
   echo "    	 8  -  Red Hat Enterprise Linux 9"

diff --git a/build.yaml b/build.yaml
@@ -31,9 +31,9 @@ menu:
           var_files:
             - "network.pkrvars.hcl"
             - "linux-storage.pkrvars.hcl"
-      - entry: "Ubuntu Server 23.10"
+      - entry: "Ubuntu Server 24.04 LTS"
         build:
-          path: "builds/linux/ubuntu/23-10/"
+          path: "builds/linux/ubuntu/24-04-lts/"
           var_files:
             - "network.pkrvars.hcl"
             - "linux-storage.pkrvars.hcl"

diff --git a/builds/linux/ubuntu/23-10/data/meta-data → builds/linux/ubuntu/24-04-lts/data/meta-data b/builds/linux/ubuntu/23-10/data/meta-data → builds/linux/ubuntu/24-04-lts/data/meta-data
diff --git a/...inux/ubuntu/23-10/data/network.pkrtpl.hcl → .../ubuntu/24-04-lts/data/network.pkrtpl.hcl b/...inux/ubuntu/23-10/data/network.pkrtpl.hcl → .../ubuntu/24-04-lts/data/network.pkrtpl.hcl
diff --git a/...inux/ubuntu/23-10/data/storage.pkrtpl.hcl → .../ubuntu/24-04-lts/data/storage.pkrtpl.hcl b/...inux/ubuntu/23-10/data/storage.pkrtpl.hcl → .../ubuntu/24-04-lts/data/storage.pkrtpl.hcl
diff --git a/...ux/ubuntu/23-10/data/user-data.pkrtpl.hcl → ...buntu/24-04-lts/data/user-data.pkrtpl.hcl b/...ux/ubuntu/23-10/data/user-data.pkrtpl.hcl → ...buntu/24-04-lts/data/user-data.pkrtpl.hcl
@@ -3,7 +3,7 @@
 # Copyright 2023-2024 Broadcom. All rights reserved.
 # SPDX-License-Identifier: BSD-2
 
-# Ubuntu Server 23.10
+# Ubuntu Server 34.04 LTS
 
 autoinstall:
   version: 1

diff --git a/...s/linux/ubuntu/23-10/linux-ubuntu.pkr.hcl → ...nux/ubuntu/24-04-lts/linux-ubuntu.pkr.hcl b/...s/linux/ubuntu/23-10/linux-ubuntu.pkr.hcl → ...nux/ubuntu/24-04-lts/linux-ubuntu.pkr.hcl
@@ -3,8 +3,8 @@
 
 /*
     DESCRIPTION:
-    Ubuntu Server 23.10 build definition.
-        Packer Plugin for VMware vSphere: 'vsphere-iso' builder.
+    Ubuntu Server 24.04 LTS build definition.
+    Packer Plugin for VMware vSphere: 'vsphere-iso' builder.
 */
 
 //  BLOCK: packer

diff --git a/...tu/23-10/linux-ubuntu.pkrvars.hcl.example → ...4-04-lts/linux-ubuntu.pkrvars.hcl.example b/...tu/23-10/linux-ubuntu.pkrvars.hcl.example → ...4-04-lts/linux-ubuntu.pkrvars.hcl.example
@@ -3,7 +3,7 @@
 
 /*
     DESCRIPTION:
-    Ubuntu Server 23.10 build variables.
+    Ubuntu Server 24.04 LTS build variables.
     Packer Plugin for VMware vSphere: 'vsphere-iso' builder.
 */
 
@@ -13,7 +13,7 @@ vm_guest_os_keyboard = "us"
 vm_guest_os_timezone = "UTC"
 vm_guest_os_family   = "linux"
 vm_guest_os_name     = "ubuntu"
-vm_guest_os_version  = "23.10"
+vm_guest_os_version  = "24.04-lts"
 
 // Virtual Machine Guest Operating System Setting
 vm_guest_os_type      = "ubuntu64Guest"
@@ -35,8 +35,8 @@ vm_network_card          = "vmxnet3"
 
 // Removable Media Settings
 iso_datastore_path       = "iso/linux/ubuntu"
-iso_content_library_item = "ubuntu-23.10-live-server-amd64"
-iso_file                 = "ubuntu-23.10-live-server-amd64.iso"
+iso_content_library_item = "ubuntu-24.04-live-server-amd64"
+iso_file                 = "ubuntu-24.04-live-server-amd64.iso"
 
 // Boot Settings
 vm_boot_order = "disk,cdrom"

diff --git a/...ux/ubuntu/23-10/variables-network.pkr.hcl → ...buntu/24-04-lts/variables-network.pkr.hcl b/...ux/ubuntu/23-10/variables-network.pkr.hcl → ...buntu/24-04-lts/variables-network.pkr.hcl
@@ -3,7 +3,7 @@
 
 /*
     DESCRIPTION:
-    Ubuntu Server 23.10 network variables.
+    Ubuntu Server 24.04 LTS network variables.
     Packer Plugin for VMware vSphere: 'vsphere-iso' builder.
 */
 

diff --git a/...ux/ubuntu/23-10/variables-storage.pkr.hcl → ...buntu/24-04-lts/variables-storage.pkr.hcl b/...ux/ubuntu/23-10/variables-storage.pkr.hcl → ...buntu/24-04-lts/variables-storage.pkr.hcl
@@ -3,7 +3,7 @@
 
 /*
     DESCRIPTION:
-    Ubuntu Server 23.10 storage variables.
+    Ubuntu Server 24.04 LTS storage variables.
     Packer Plugin for VMware vSphere: 'vsphere-iso' builder.
 */
 

diff --git a/builds/linux/ubuntu/23-10/variables.pkr.hcl → .../linux/ubuntu/24-04-lts/variables.pkr.hcl b/builds/linux/ubuntu/23-10/variables.pkr.hcl → .../linux/ubuntu/24-04-lts/variables.pkr.hcl
diff --git a/builds/linux/ubuntu/24.04-lts/data/meta-data b/builds/linux/ubuntu/24.04-lts/data/meta-data
diff --git a/builds/linux/ubuntu/24.04-lts/data/network.pkrtpl.hcl b/builds/linux/ubuntu/24.04-lts/data/network.pkrtpl.hcl
diff --git a/docs/getting-started/iso.md b/docs/getting-started/iso.md
@@ -17,7 +17,7 @@ Download the Linux distribution ISO files from the publisher.
 | | 4.0 | [:fontawesome-solid-cloud-arrow-down:][download-linux-photon-4] &nbsp; `photon-4.0-xxxxxxxxx.iso` |
 | :fontawesome-brands-debian: &nbsp;&nbsp; Debian @span | 12 | [:fontawesome-solid-cloud-arrow-down:][download-linux-debian-12] &nbsp; `debian-12.x.x-amd64-netinst.iso` |
 | | 11 | [:fontawesome-solid-cloud-arrow-down:][download-linux-debian-11] &nbsp; `debian-11.x.x-amd64-netinst.iso` |
-| :fontawesome-brands-ubuntu: &nbsp;&nbsp; Ubuntu Server @span | 23.10 | [:fontawesome-solid-cloud-arrow-down:][download-linux-ubuntu-2310] &nbsp; `ubuntu-23.10-live-server-amd64.iso` |
+| :fontawesome-brands-ubuntu: &nbsp;&nbsp; Ubuntu Server @span | 24.04 LTS | [:fontawesome-solid-cloud-arrow-down:][download-linux-ubuntu-2310] &nbsp; `ubuntu-24.04.x-live-server-amd64.iso` |
 | | 22.04 LTS | [:fontawesome-solid-cloud-arrow-down:][download-linux-ubuntu-2204] &nbsp; `ubuntu-22.04.x-live-server-amd64.iso` |
 | | 20.04 LTS | [:fontawesome-solid-cloud-arrow-down:][download-linux-ubuntu-2004] &nbsp; `ubuntu-20.04.x-live-server-amd64.iso` |
 | :fontawesome-brands-redhat: &nbsp;&nbsp; Red Hat Enterprise Linux @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rhel-9] &nbsp; `rhel-9.x-x86_64-dvd.iso` |

diff --git a/docs/index.md b/docs/index.md
@@ -19,9 +19,9 @@ This project supports the following guest operating systems:
 | :---                                                                    | :---      | :---                                 | :---                                 | :---                                 | :---                                 |
 | :simple-vmware: &nbsp;&nbsp; VMware Photon OS @span                     | 5.0       | :octicons-check-circle-24:{ .green } | :octicons-x-circle-24:               | :octicons-check-circle-24:{ .green } | :octicons-x-circle-24:               |
 |                                                                         | 4.0       | :octicons-check-circle-24:{ .green } | :octicons-x-circle-24:               | :octicons-check-circle-24:{ .green } | :octicons-x-circle-24:               |
-| :fontawesome-brands-debian: &nbsp;&nbsp; Debian @span                   | 12        | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green }     | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
+| :fontawesome-brands-debian: &nbsp;&nbsp; Debian @span                   | 12        | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
 |                                                                         | 11        | :octicons-check-circle-24:{ .green } | :octicons-x-circle-24:               | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
-| :fontawesome-brands-ubuntu: &nbsp;&nbsp; Ubuntu Server @span            | 23.10     | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
+| :fontawesome-brands-ubuntu: &nbsp;&nbsp; Ubuntu Server @span            | 24.04 LTS | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
 |                                                                         | 22.04 LTS | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
 |                                                                         | 20.04 LTS | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
 | :fontawesome-brands-redhat: &nbsp;&nbsp; Red Hat Enterprise Linux @span | 9         | :octicons-check-circle-24:{ .green } | :octicons-x-circle-24:               | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |