Skip to content

Commit

Permalink
feat: add ubuntu 24.04 lts (#891)
Browse files Browse the repository at this point in the history
- 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]>
  • Loading branch information
tenthirtyam committed Apr 22, 2024
1 parent b587054 commit d4e20a8
Show file tree
Hide file tree
Showing 17 changed files with 59 additions and 51 deletions.
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

##############################################################################
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
**Enhancement**:

- Adds Ubuntu Server 24.04 LTS to the project.
[#891](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/891)
- 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),
Expand All @@ -21,6 +23,11 @@
- Adds option to enable cloud-init on Rocky Linux 8.
[#895](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/895)

**Chore**:

- Removes Ubuntu Server 23.10 from the project; superseded by 24.04 LTS.
[#891](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/891)

## v0.19.1

> Release Date: 2024-04-15
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
10 changes: 5 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand All @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down
File renamed without changes.
49 changes: 25 additions & 24 deletions docs/getting-started/iso.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ operating system [ISO][iso] files.
Download the Linux distribution ISO files from the publisher.

::spantable::
| Operating System | Version | Download |
| :--- | :--- | :--- |
| :simple-vmware: &nbsp;&nbsp; VMware Photon OS @span | 5.0 | [:fontawesome-solid-cloud-arrow-down:][download-linux-photon-5] &nbsp; `photon-5.0-xxxxxxxxx.x86_64.iso` |
| | 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` |
| | 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` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rhel-8] &nbsp; `rhel-8.x-x86_64-dvd.iso` |
| | 7 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rhel-7] &nbsp; `rhel-server-7.x-x86_64-dvd.iso` |
| :fontawesome-brands-linux: &nbsp;&nbsp; AlmaLinux OS @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-alma-9] &nbsp; `AlmaLinux-9.x-x86_64-dvd.iso` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-alma-8] &nbsp; `AlmaLinux-8.x-x86_64-dvd.iso` |
| :simple-rockylinux: &nbsp;&nbsp; Rocky Linux @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rocky-9] &nbsp; `Rocky-9.x-x86_64-dvd.iso` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rocky-8] &nbsp; `Rocky-8.x-x86_64-dvd.iso` |
| :simple-oracle: &nbsp;&nbsp; Oracle Linux @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-oracle-9] &nbsp; `OracleLinux-R9-U2-x86_64-dvd.iso` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-oracle-8] &nbsp; `OracleLinux-R8-U8-x86_64-dvd.iso` |
| :fontawesome-brands-centos: &nbsp;&nbsp; CentOS @span | 9 Stream | [:fontawesome-solid-cloud-arrow-down:][download-linux-centos-stream-9] &nbsp; `CentOS-Stream-9-latest-x86_64-dvd1.iso` |
| | 8 Stream | [:fontawesome-solid-cloud-arrow-down:][download-linux-centos-stream-8] &nbsp; `CentOS-Stream-8-x86_64-latest-dvd1.iso` |
| | 7 | [:fontawesome-solid-cloud-arrow-down:][download-linux-centos-7] &nbsp; `CentOS-7-x86_64-DVD.iso` |
| :fontawesome-brands-suse: &nbsp;&nbsp; SUSE Linux Enterprise @span | 15 | [:fontawesome-solid-cloud-arrow-down:][download-linux-sles-15] &nbsp; `SLE-15-SPx-Full-x86_64-GM-Media1.iso` |
| Operating System | Version | Download |
| :--- | :--- | :--- |
| :simple-vmware: &nbsp;&nbsp; VMware Photon OS @span | 5.0 | [:fontawesome-solid-cloud-arrow-down:][download-linux-photon-5] &nbsp; `photon-5.0-xxxxxxxxx.x86_64.iso` |
| | 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 | 24.04 LTS | [:fontawesome-solid-cloud-arrow-down:][download-linux-ubuntu-2310] &nbsp; `ubuntu-23.10-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` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rhel-8] &nbsp; `rhel-8.x-x86_64-dvd.iso` |
| | 7 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rhel-7] &nbsp; `rhel-server-7.x-x86_64-dvd.iso` |
| :fontawesome-brands-linux: &nbsp;&nbsp; AlmaLinux OS @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-alma-9] &nbsp; `AlmaLinux-9.x-x86_64-dvd.iso` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-alma-8] &nbsp; `AlmaLinux-8.x-x86_64-dvd.iso` |
| :simple-rockylinux: &nbsp;&nbsp; Rocky Linux @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rocky-9] &nbsp; `Rocky-9.x-x86_64-dvd.iso` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-rocky-8] &nbsp; `Rocky-8.x-x86_64-dvd.iso` |
| :simple-oracle: &nbsp;&nbsp; Oracle Linux @span | 9 | [:fontawesome-solid-cloud-arrow-down:][download-linux-oracle-9] &nbsp; `OracleLinux-R9-U2-x86_64-dvd.iso` |
| | 8 | [:fontawesome-solid-cloud-arrow-down:][download-linux-oracle-8] &nbsp; `OracleLinux-R8-U8-x86_64-dvd.iso` |
| :fontawesome-brands-centos: &nbsp;&nbsp; CentOS @span | 9 Stream | [:fontawesome-solid-cloud-arrow-down:][download-linux-centos-stream-9] &nbsp; `CentOS-Stream-9-latest-x86_64-dvd1.iso` |
| | 8 Stream | [:fontawesome-solid-cloud-arrow-down:][download-linux-centos-stream-8] &nbsp; `CentOS-Stream-8-x86_64-latest-dvd1.iso` |
| | 7 | [:fontawesome-solid-cloud-arrow-down:][download-linux-centos-7] &nbsp; `CentOS-7-x86_64-DVD.iso` |
| :fontawesome-brands-suse: &nbsp;&nbsp; SUSE Linux Enterprise @span | 15 | [:fontawesome-solid-cloud-arrow-down:][download-linux-sles-15] &nbsp; `SLE-15-SPx-Full-x86_64-GM-Media1.iso` |
::end-spantable::

## :fontawesome-brands-windows: Microsoft Windows
Expand Down Expand Up @@ -71,7 +71,7 @@ configuration variables.

Update the ISO path and file for each guest operating system in the configuration variables.

```hcl title="builds/linux/photon/5/packer.auto.pkrvars.hcl"
````hcl title="builds/linux/photon/5/packer.auto.pkrvars.hcl"
iso_datastore_path = "iso/linux/photon"
iso_content_library_item = "photon-5.0-xxxxxxxxx"
iso_file = "photon-5.0-xxxxxxxxx.iso"
Expand All @@ -97,10 +97,11 @@ iso_file = "photon-5.0-xxxxxxxxx.iso"
[download-linux-sles-15]: https://www.suse.com/download/sles/
[download-linux-ubuntu-2004]: https://releases.ubuntu.com/20.04/
[download-linux-ubuntu-2204]: https://releases.ubuntu.com/22.04/
[download-linux-ubuntu-2310]: https://releases.ubuntu.com/23.10/
[download-linux-ubuntu-2404]: https://releases.ubuntu.com/24.04/
[download-windows-server-2022]: https://www.microsoft.com/evalcenter/evaluate-windows-server-2022
[download-windows-server-2019]: https://www.microsoft.com/evalcenter/evaluate-windows-server-2019
[download-windows-server-2025]: https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver
[download-windows-11]: https://www.microsoft.com/evalcenter/evaluate-windows-11-enterprise
[download-windows-10]: https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise
[iso]: https://en.wikipedia.org/wiki/ISO_imageGUID-58D77EA5-50D9-4A8E-A15A-D7B3ABA11B87.html
````
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This project supports the following guest operating systems:
| | 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 } |
| | 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-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } | :octicons-check-circle-24:{ .green } |
Expand Down
12 changes: 6 additions & 6 deletions project.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,22 @@
"url": "https://ubuntu.com"
},
"versions": {
"23.10": [
"24.04": [
{
"version": "23.10.0",
"version": "24.04 LTS",
"architectures": [
{
"architecture": "amd64",
"download_link": "https://releases.ubuntu.com/releases/23.10/ubuntu-23.10-live-server-amd64.iso",
"download_link": "https://releases.ubuntu.com/releases/24.04/ubuntu-24.04-live-server-amd64.iso",
"checksum_algorithm": "sha256",
"checksum": "https://releases.ubuntu.com/releases/23.10/SHA256SUMS"
"checksum": "https://releases.ubuntu.com/releases/24.04/SHA256SUMS"
}
]
}
],
"22.04": [
{
"version": "22.04.4",
"version": "22.04 LTS",
"architectures": [
{
"architecture": "amd64",
Expand All @@ -104,7 +104,7 @@
],
"20.04": [
{
"version": "20.04.6",
"version": "20.04 LTS",
"architectures": [
{
"architecture": "amd64",
Expand Down

0 comments on commit d4e20a8

Please sign in to comment.