Skip to content

Commit

Permalink
added ubuntu 24.04
Browse files Browse the repository at this point in the history
Signed-off-by: Corey Hemminger <[email protected]>
  • Loading branch information
Stromweld committed Apr 26, 2024
1 parent 53a3301 commit 6060ab8
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 104 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-hyperv-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- hyperv-iso
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-parallels-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- parallels-iso
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-parallels-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- parallels-iso
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-qemu-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- qemu
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-qemu-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- qemu
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-virtualbox-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- virtualbox-iso
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-virtualbox-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- virtualbox-iso
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-vmware-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- vmware-iso
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkr-bld-vmware-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04
provider:
- vmware-iso
steps:
Expand Down
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#>
| solaris-11 | license<br>needed | license<br>needed | na | license<br>needed | na | license<br>needed | na | license<br>needed | na |
| ubuntu-20.04 | | | x | | | x | | x | x |
| ubuntu-22.04 | | x | | | | x | | | |
| ubuntu-24.04 | | | | | | | | | |
| ubuntu-24.04 | | x | x | | | x | | x | x |
| windows-10 | | | na | | na | x | na | | na |
| windows-11 | | x | x | | | x | | x | |
| windows-2016 | | x | na | | na | x | na | x | na |
Expand All @@ -54,9 +54,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#>
- Create CD pipeline to upload vagrant boxes after PR is merged
- Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches

## [unreleased] (2024-04-24)
## [unreleased] (2024-04-26)

## [v4.1.1] (2024-04-24)
## [v4.1.1] (2024-04-26)

- Require ruby >= 3.0.0
- Add parallels-ipsw source
Expand All @@ -67,6 +67,7 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#>
- Added build_files directory for all temp files to be stored in during packer building
- Opensuse-leap-15.5 updated to 15.6
- Remove Fedora 38 and add 40 builds
- Remove Ubuntu 23.10 and add 24.04 builds

## [v4.1.0] (2024-04-11)

Expand Down
2 changes: 1 addition & 1 deletion builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public:
- rockylinux-9
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-23.10
- ubuntu-24.04

# slug box name: text string from standard box name to match
slugs:
Expand Down
2 changes: 1 addition & 1 deletion lib/bento/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def self.parse(args)
options.metadata_only = opt
end

opts.on('--on-error', '[cleanup|abort|ask|run-cleanup-provisioner] If the build fails do: clean up (default), abort, ask, or run-cleanup-provisioner.') do |opt|
opts.on('--on-error OPT', '[cleanup|abort|ask|run-cleanup-provisioner] If the build fails do: clean up (default), abort, ask, or run-cleanup-provisioner.') do |opt|
options.on_error = opt
end

Expand Down
4 changes: 3 additions & 1 deletion lib/bento/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ def start
end
end
banner("Testing finished in #{duration(time.real)}.")
unless errors.empty?
if errors.empty?
banner('All tests passed.')
else
raise("Failed Tests:\n#{errors.join("\n")}\nexited #{$CHILD_STATUS}")
end
end
Expand Down
73 changes: 0 additions & 73 deletions os_pkrvars/macos/macos-14-x86_64.pkrvars.hcl

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
os_name = "ubuntu"
os_version = "23.10"
os_version = "24.04"
os_arch = "aarch64"
iso_url = "https://cdimage.ubuntu.com/releases/mantic/release/ubuntu-23.10-live-server-arm64.iso"
iso_checksum = "file:https://cdimage.ubuntu.com/releases/mantic/release/SHA256SUMS"
iso_url = "https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso"
iso_checksum = "file:https://cdimage.ubuntu.com/releases/noble/release/SHA256SUMS"
parallels_guest_os_type = "ubuntu"
vbox_guest_os_type = "Ubuntu_64"
vmware_guest_os_type = "arm-ubuntu-64"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
os_name = "ubuntu"
os_version = "23.10"
os_version = "24.04"
os_arch = "x86_64"
iso_url = "https://releases.ubuntu.com/mantic/ubuntu-23.10-live-server-amd64.iso"
iso_checksum = "file:https://releases.ubuntu.com/mantic/SHA256SUMS"
iso_url = "https://releases.ubuntu.com/noble/ubuntu-24.04-live-server-amd64.iso"
iso_checksum = "file:https://releases.ubuntu.com/noble/SHA256SUMS"
parallels_guest_os_type = "ubuntu"
vbox_guest_os_type = "Ubuntu_64"
vmware_guest_os_type = "ubuntu-64"
Expand Down
6 changes: 4 additions & 2 deletions packer_templates/http/ubuntu/user-data
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ autoinstall:
install-server: yes
allow-pw: yes
late-commands:
# - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf
- 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml'
- |
if [ -f /target/etc/netplan/00-installer-config.yaml ]; then
'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml'
fi
- echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant
# Enable hyper-v daemons only if using hyper-v virtualization
- if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi
1 change: 0 additions & 1 deletion packer_templates/pkr-sources.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ source "parallels-ipsw" "vm" {
prlctl = local.parallels_prlctl
prlctl_post = var.parallels_prlctl_post
prlctl_version_file = var.parallels_prlctl_version_file
sound = false
# Source block common options
boot_command = var.boot_command
boot_wait = var.parallels_boot_wait == null ? local.default_boot_wait : var.parallels_boot_wait
Expand Down
28 changes: 21 additions & 7 deletions packer_templates/scripts/macos/shrink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,27 @@ echo 'Turn off hibernation and get rid of the sleepimage'
pmset hibernatemode 0
rm -f /var/vm/sleepimage

echo 'Stop the pager process and drop swap files. These will be re-created on boot.'
# Starting with El Cap we can only stop the dynamic pager if SIP is disabled.
if csrutil status | grep -q disabled; then
launchctl unload /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist
sleep 5
fi
rm -rf /private/var/vm/swap*
echo 'Remove Screensaver video files'
rm -rf /Library/Application Support/com.apple.idleassetsd/Customer/* || echo "rm screensaver videos exit code $? is suppressed"

echo 'Remove user files'
rm -rf /Users/vagrant/* || echo "rm vagrant user files exit code $? is suppressed"
rm -rf /var/root/* || echo "rm root user files exit code $? is suppressed"

echo 'Remove system caches'
rm -rf /Library/Caches/* || echo "rm library caches exit code $? is suppressed"
rm -rf /System/Library/Caches/* || echo "rm system library caches exit code $? is suppressed"

echo 'Remove logs'
rm -rf /Library/Logs/* || echo "rm library logs exit code $? is suppressed"

echo 'Remove swap file'
rm -rf /System/Volumes/VM/swapfile* || echo "rm swapfile exit code $? is suppressed"

#echo 'Whiteout root'
#dd if=/dev/zero of=/tmp/whitespace bs=1M || echo "dd root exit code $? is suppressed"
#sync
#rm /tmp/whitespace || echo "rm tmp/whitespace exit code $? is suppressed"

echo 'VMware Fusion specific items'
if [ -e .vmfusion_version ] || [[ "$PACKER_BUILDER_TYPE" == vmware* ]]; then
Expand Down

0 comments on commit 6060ab8

Please sign in to comment.