From ba10f22c8c82b8baf868f8e79bf985af3de4d253 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Wed, 31 Jan 2024 16:07:00 -0600 Subject: [PATCH] Update latest OS versions and fix arm64 build list command (#1543) * Update latest OS versions and fix arm64 build list command --------- --- .github/workflows/pkr-bld-hyperv-x64.yml | 7 +- .github/workflows/pkr-bld-parallels-arm64.yml | 3 +- .github/workflows/pkr-bld-parallels-x64.yml | 7 +- .github/workflows/pkr-bld-qemu-arm64.yml | 3 +- .github/workflows/pkr-bld-qemu-x64.yml | 7 +- .../workflows/pkr-bld-virtualbox-arm64.yml | 3 +- .github/workflows/pkr-bld-virtualbox-x64.yml | 7 +- .github/workflows/pkr-bld-vmware-arm64.yml | 3 +- .github/workflows/pkr-bld-vmware-x64.yml | 7 +- CHANGELOG.md | 90 ++++++++++--------- README.md | 9 +- builds.yml | 25 +----- lib/bento/cli.rb | 9 +- lib/bento/common.rb | 1 + lib/bento/upload.rb | 19 ++-- lib/bento/version.rb | 2 +- .../centos/centos-7-aarch64.pkrvars.hcl | 2 +- os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl | 2 +- .../debian/debian-11-aarch64.pkrvars.hcl | 4 +- .../debian/debian-11-x86_64.pkrvars.hcl | 4 +- .../freebsd/freebsd-12-aarch64.pkrvars.hcl | 9 -- .../freebsd/freebsd-12-x86_64.pkrvars.hcl | 9 -- .../oracle/oracle-8-aarch64.pkrvars.hcl | 6 +- os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl | 6 +- .../oracle/oracle-9-aarch64.pkrvars.hcl | 6 +- os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl | 6 +- os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl | 2 +- os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl | 2 +- .../rockylinux-8-aarch64.pkrvars.hcl | 4 +- .../rockylinux-8-x86_64.pkrvars.hcl | 4 +- .../scientificlinux-7-x86_64.pkrvars.hcl | 9 -- os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl | 6 +- .../springdalelinux-7-x86_64.pkrvars.hcl | 9 -- .../springdalelinux-8-x86_64.pkrvars.hcl | 9 -- .../springdalelinux-9-x86_64.pkrvars.hcl | 9 -- .../ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl | 2 +- ...s.hcl => ubuntu-23.10-aarch64.pkrvars.hcl} | 6 +- ...rs.hcl => ubuntu-23.10-x86_64.pkrvars.hcl} | 6 +- 40 files changed, 125 insertions(+), 203 deletions(-) delete mode 100644 os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl delete mode 100644 os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl delete mode 100644 os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl rename os_pkrvars/ubuntu/{ubuntu-23.04-aarch64.pkrvars.hcl => ubuntu-23.10-aarch64.pkrvars.hcl} (69%) rename os_pkrvars/ubuntu/{ubuntu-23.04-x86_64.pkrvars.hcl => ubuntu-23.10-x86_64.pkrvars.hcl} (61%) diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index 62dabdbb2..fae3953c8 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index 353648dac..08ec7d8ab 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 02c6c09e2..1b9d1d3e2 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index a49121387..69e50b286 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3a86d84fb..b5fbc75bd 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 83e89b93c..5a5057700 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 3b8619d86..e3d29389e 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 527c3cd8d..dcfd9e484 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -32,7 +31,7 @@ jobs: - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - vmware-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index 94f43c695..0e8b489d4 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -21,7 +21,6 @@ jobs: - debian-12 - fedora-38 - fedora-39 - - freebsd-12 - freebsd-13 - freebsd-14 - opensuse-leap-15 @@ -30,13 +29,9 @@ jobs: - oracle-9 - rockylinux-8 - rockylinux-9 - - scientificlinux-7 - - springdalelinux-7 - - springdalelinux-8 - - springdalelinux-9 - ubuntu-20.04 - ubuntu-22.04 - - ubuntu-23.04 + - ubuntu-23.10 provider: - vmware-iso steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 395fa9c4d..073a25234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,45 +5,41 @@ ***Note:** Markdown table generated at -| | hyperv
x86_64 | parallels
x86_64 | parallels
aarch64 | qemu
x86_64 | qemu
aarch64 | virtualbox
x86_64 | virtualbox
aarch64 | vmware
x86_64 | vmware
aarch64 | -|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:| -| almalinux-8 | | x | | x | | x | | x | | -| almalinux-9 | | x | x | | | x | | x | x | -| amazonlinux-2 | | na | na | | | | na | | na | -| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | -| centos-7 | | x | | x | | x | | x | | -| centos-stream-8 | | x | | x | | x | | x | | -| centos-stream-9 | | | x | | | | | | | -| debian-11 | | x | x | | | x | | x | | -| debian-12 | | x | x | | | x | | x | x | -| fedora-37 | | x | x | x | | x | | x | x | -| fedora-38 | | x | | x | | x | | x | x | -| freebsd-12 | | | | | | x | | x | | -| freebsd-13 | | | | | | x | | x | | -| opensuse-leap-15 | | x | | x | | x | | x | | -| oraclelinux-7 | | x | | x | | x | | x | | -| oraclelinux-8 | | | | x | | x | | x | | -| oraclelinux-9 | | x | x | | | x | | x | | -| rhel-7 | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | -| rhel-8 | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | -| rhel-9 | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | -| rockylinux-8 | | x | | x | | x | | x | | -| rockylinux-9 | | x | | | | x | | x | x | -| scientificlinux-7 | | x | na | x | na | x | na | x | na | -| sles-12 | license
needed | license
needed | na | license
needed | na | license
needed | na | license
needed | na | -| sles-13 | license
needed | license
needed | na | license
needed | na | license
needed | na | license
needed | na | -| solaris-11 | license
needed | license
needed | na | license
needed | na | license
needed | na | license
needed | na | -| springdalelinux-7 | | x | na | x | na | | na | | na | -| springdalelinux-8 | | x | na | x | na | x | na | x | na | -| springdalelinux-9 | | | na | | na | | na | | na | -| ubuntu-20.04 | | x | x | | | x | | x | x | -| ubuntu-22.04 | | x | | x | | x | | x | | -| ubuntu-23.04 | | x | | x | | x | | x | | -| windows-10 | | x | na | | na | x | na | | na | -| windows-11 | | x | na | | na | x | na | | na | -| windows-2016 | | x | na | | na | x | na | | na | -| windows-2019 | | x | na | | na | x | na | | na | -| windows-2022 | | x | na | | na | x | na | | na | +| | hyperv
x86_64 | parallels
x86_64 | parallels
aarch64 | qemu
x86_64 | qemu
aarch64 | virtualbox
x86_64 | virtualbox
aarch64 | vmware
x86_64 | vmware
aarch64 | +|:-----------------:|:---:|:---:|:--------------------:|:---:|:---:|:---:|:---:|:---:|:---:| +| almalinux-8 | | x | | x | | x | | x | | +| almalinux-9 | | x | x | | | x | | x | x | +| amazonlinux-2 | | na | na | | | | na | | na | +| amazonlinux-2023 | na | na | na | na | na | na | na | na | na | +| centos-7 | | x | | x | | x | | x | | +| centos-stream-8 | | x | | x | | x | | x | | +| centos-stream-9 | | | x | | | | | | | +| debian-11 | | x | x | | | x | | x | | +| debian-12 | | x | x | | | x | | x | x | +| fedora-38 | | x | | x | | x | | x | x | +| fedora-39 | | | | | | | | | | +| freebsd-12 | | | | | | x | | x | | +| freebsd-13 | | | | | | x | | x | | +| opensuse-leap-15 | | x | | x | | x | | x | | +| oraclelinux-7 | | x | | x | | x | | x | | +| oraclelinux-8 | | | | x | | x | | x | | +| oraclelinux-9 | | x | x | | | x | | x | | +| rhel-7 | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | +| rhel-8 | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | +| rhel-9 | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | license
needed | +| rockylinux-8 | | x | | x | | x | | x | | +| rockylinux-9 | | x | | | | x | | x | x | +| sles-12 | license
needed | license
needed | na | license
needed | na | license
needed | na | license
needed | na | +| sles-13 | license
needed | license
needed | na | license
needed | na | license
needed | na | license
needed | na | +| solaris-11 | license
needed | license
needed | na | license
needed | na | license
needed | na | license
needed | na | +| ubuntu-20.04 | | x | x | | | x | | x | x | +| ubuntu-22.04 | | x | | x | | x | | x | | +| ubuntu-23.10 | | | | | | | | | | +| windows-10 | | x | na | | na | x | na | | na | +| windows-11 | | x | na | | na | x | na | | na | +| windows-2016 | | x | na | | na | x | na | | na | +| windows-2019 | | x | na | | na | x | na | | na | +| windows-2022 | | x | na | | na | x | na | | na | ### Todo @@ -58,7 +54,21 @@ Markdown table generated at - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches - Added ability to configure bento upload of private or public boxes in builds.yml, defaults to private -## [unreleased] (2023-09-15) +## [unreleased] (2024-01-31) + +- Fix build list generation on aarch64 machines +- Updated Debian 12 to 12.4 +- Updated RockyLinux 9 to 9.3 +- Updated Oracle Linux 8 to 8.9 +- Updated Oracle Linux 9 to 9.3 +- Added FreeBSD 14 +- Removed FreeBSD 12 +- Added Fedora 39 +- Removed Fedora 37 +- Remove Scientific Linux 7 +- Remove Springdale Linux builds +- Removed Ubuntu 23.04 +- Added Ubuntu 23.10 ## [v.3.2.0] (2023-09-15) diff --git a/README.md b/README.md index da579c5c5..5daaa8919 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,12 @@ end - [VirtualBox](https://www.virtualbox.org/) - [VMware Fusion](https://www.vmware.com/products/fusion.html) - [VMware Workstation](https://www.vmware.com/products/workstation-pro.html) - - [Parallels Desktop](https://www.parallels.com/products/desktop/) also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versons < 19.x - - [qemu](https://www.qemu.org/) * - - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) * + - [Parallels Desktop Pro](https://www.parallels.com/products/desktop/)*2 also requires [Parallels Virtualization SDK](https://www.parallels.com/products/desktop/download/) for versions < 19.x + - [qemu](https://www.qemu.org/) *1 + - [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/about/) *1 -***NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. +*1**NOTE:** support for these providers is considered experimental and corresponding Vagrant Cloud images may or may not exist. +*2**NOTE:** AARCH64 or ARM64 support is only guaranteed through parallels provider. ### Using `bento` executable diff --git a/builds.yml b/builds.yml index 4aa1bf5df..a429f96e8 100644 --- a/builds.yml +++ b/builds.yml @@ -13,7 +13,6 @@ public: - 'debian-12' - 'fedora-38' - 'fedora-39' - - 'freebsd-12' - 'freebsd-13' - 'freebsd-14' - 'opensuse-leap-15' @@ -22,13 +21,9 @@ public: - 'oracle-9' - 'rockylinux-8' - 'rockylinux-9' - - 'scientific-7' - - 'springdalelinux-7' - - 'springdalelinux-8' - - 'springdalelinux-9' - 'ubuntu-20.04' - 'ubuntu-22.04' - - 'ubuntu-23.04' + - 'ubuntu-23.10' - 'almalinux-8-arm64' - 'almalinux-9-arm64' - 'amazon-2-arm64' @@ -40,7 +35,6 @@ public: - 'debian-12-arm64' - 'fedora-38-arm64' - 'fedora-39-arm64' - - 'freebsd-12-arm64' - 'freebsd-13-arm64' - 'freebsd-14-arm64' - 'opensuse-leap-15-arm64' @@ -49,13 +43,9 @@ public: - 'oracle-9-arm64' - 'rockylinux-8-arm64' - 'rockylinux-9-arm64' - - 'scientific-7-arm64' - - 'springdalelinux-7-arm64' - - 'springdalelinux-8-arm64' - - 'springdalelinux-9-arm64' - 'ubuntu-20.04-arm64' - 'ubuntu-22.04-arm64' - - 'ubuntu-23.04-arm64' + - 'ubuntu-23.10-arm64' # slug box name: text string from standard box name to match (generally the same) slugs: @@ -64,8 +54,7 @@ slugs: 'centos-7': 'centos-7' 'debian-12': 'debian-12' 'debian-11': 'debian-11' - 'fedora-latest': 'fedora-38' - 'freebsd-12': 'freebsd-12' + 'fedora-latest': 'fedora-39' 'freebsd-13': 'freebsd-13' 'freebsd-14': 'freebsd-14' 'opensuse-leap-15': 'opensuse-leap-15' @@ -74,16 +63,12 @@ slugs: 'oracle-9': 'oracle-9' 'rockylinux-8': 'rockylinux-8' 'rockylinux-9': 'rockylinux-9' - 'scientific-7': 'scientific-7' - 'springdalelinux-7': 'springdalelinux-7' - 'springdalelinux-8': 'springdalelinux-8' - 'springdalelinux-9': 'springdalelinux-9' 'almalinux-8-arm64': 'almalinux-8' 'almalinux-9-arm64': 'almalinux-9' 'centos-7-arm64': 'centos-7' 'debian-12-arm64': 'debian-12' 'debian-11-arm64': 'debian-11' - 'fedora-latest-arm64': 'fedora-38' + 'fedora-latest-arm64': 'fedora-39' 'oracle-7-arm64': 'oracle-7' 'oracle-8-arm64': 'oracle-8' 'oracle-9-arm64': 'oracle-9' @@ -105,6 +90,4 @@ do_not_build: # - opensuse-leap # - oracle # - rockylinux -# - scientificlinux -# - springdalelinux # - ubuntu diff --git a/lib/bento/cli.rb b/lib/bento/cli.rb index bd3301287..5b44ae3ce 100644 --- a/lib/bento/cli.rb +++ b/lib/bento/cli.rb @@ -11,9 +11,14 @@ class Options NAME = File.basename($PROGRAM_NAME).freeze def self.parse(args) + arch = if RbConfig::CONFIG['host_cpu'] == 'arm64' + 'aarch64' + else + RbConfig::CONFIG['host_cpu'] + end not_buildable = YAML.load(File.read('builds.yml'))['do_not_build'] options = OpenStruct.new - options.template_files = calculate_templates("os_pkrvars/**/*-#{RbConfig::CONFIG['host_cpu']}.pkrvars.hcl") + options.template_files = calculate_templates("os_pkrvars/**/*-#{arch}.pkrvars.hcl") not_buildable.each do |os| options.template_files.delete_if { |template| template.include?(os) } end @@ -83,7 +88,7 @@ def self.parse(args) options.debug = opt end - opts.on('-o BUILDS', '--only BUILDS', 'Only build some Packer builds (ex: parallels-iso,virtualbox-iso,vmware-iso)') do |opt| + opts.on('-o BUILDS', '--only BUILDS', 'Only build some Packer builds (ex: parallels-iso.vm,virtualbox-iso.vm,vmware-iso.vm)') do |opt| options.only = opt end diff --git a/lib/bento/common.rb b/lib/bento/common.rb index a6c6ddf8c..24aa0b81f 100644 --- a/lib/bento/common.rb +++ b/lib/bento/common.rb @@ -64,6 +64,7 @@ def box_metadata(metadata_file) # metadata needed for upload: boxname, version, provider, box filename metadata['name'] = json['name'] metadata['version'] = json['version'] + metadata['arch'] = json['arch'] metadata['box_basename'] = json['box_basename'] metadata['packer'] = json['packer'] metadata['vagrant'] = json['vagrant'] diff --git a/lib/bento/upload.rb b/lib/bento/upload.rb index b78c228db..c5cca05ba 100644 --- a/lib/bento/upload.rb +++ b/lib/bento/upload.rb @@ -34,20 +34,26 @@ def start # def upload_box(md_file) md_data = box_metadata(md_file) - + arch = case md_data['arch'] + when 'x86_64', 'amd64' + 'amd64' + when 'aarch64', 'arm64' + 'arm64' + else + raise "Unknown arch #{md_data.inspect}" + end md_data['providers'].each_pair do |prov, prov_data| if File.exist?(File.join('builds', prov_data['file'])) puts '' banner("Uploading #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") - - upload_cmd = "vagrant cloud publish --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['name'])}' --short-description '#{box_desc(md_data['name'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{md_data['box_basename']} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{box_desc(md_data['box_basename'])}' --short-description '#{box_desc(md_data['box_basename'])}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) slug_name = lookup_slug(md_data['name']) if slug_name puts '' banner("Uploading slug #{builds_yml['vagrant_cloud_account']}/#{slug_name} from #{md_data['box_basename']} version:#{md_data['version']} provider:#{prov}...") - upload_cmd = "vagrant cloud publish --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" + upload_cmd = "vagrant cloud publish --architecture #{arch} --no-direct-upload #{builds_yml['vagrant_cloud_account']}/#{slug_name} #{md_data['version']} #{prov} builds/#{prov_data['file']} --description '#{slug_desc(slug_name)}' --short-description '#{slug_desc(slug_name)}' --version-description '#{ver_desc(md_data)}' --force --release #{public_private_box(md_data['box_basename'])}" shellout(upload_cmd) end @@ -86,9 +92,8 @@ def public_private_box(name) else return '--no-private' if name.start_with?(public) && !public.include?('arm64') end - - return '--private' end + return '--private' end def box_desc(name) @@ -115,6 +120,6 @@ def ver_desc(md_data) tool_versions.sort! tool_versions << "packer: #{md_data['packer']}" - "#{md_data['name'].tr('-', ' ').capitalize} Vagrant box version #{md_data['version']} created with Bento by Chef. Built with: #{tool_versions.join(', ')}" + "#{md_data['box_basename'].capitalize.tr('-', ' ')} Vagrant box version #{md_data['version']} created with Bento by Chef. Built with: #{tool_versions.join(', ')}" end end diff --git a/lib/bento/version.rb b/lib/bento/version.rb index 643cd2b80..b701c30fe 100644 --- a/lib/bento/version.rb +++ b/lib/bento/version.rb @@ -1,3 +1,3 @@ module Bento - VERSION = '3.2.0'.freeze + VERSION = '3.2.1'.freeze end diff --git a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl index 2c4fbc7eb..c9cb1a8bc 100644 --- a/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-aarch64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "centos" os_version = "7.9" os_arch = "aarch64" iso_url = "https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/CentOS-7-aarch64-Minimal-2009.iso" -iso_checksum = "1bef71329e51f9bed12349aa026b3fe0c4bb27db729399a3f9addae22848da9b" +iso_checksum = "file:https://quantum-mirror.hu/mirrors/pub/centos-altarch/7.9.2009/isos/aarch64/sha256sum.txt" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl index 867d24baf..b78910cf8 100644 --- a/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl +++ b/os_pkrvars/centos/centos-7-x86_64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "centos" os_version = "7.9" os_arch = "x86_64" iso_url = "http://mirrors.kernel.org/centos/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso" -iso_checksum = "07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a" +iso_checksum = "file:https://mirrors.edge.kernel.org/centos/7.9.2009/isos/x86_64/sha256sum.txt" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl index cf5dfbab2..ee5e7dedd 100644 --- a/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "11.7" +os_version = "11.8" os_arch = "aarch64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/debian-11.8.0-arm64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/arm64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" diff --git a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl index 989e2875e..9107b7f2e 100644 --- a/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/debian/debian-11-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "debian" -os_version = "11.7" +os_version = "11.8" os_arch = "x86_64" -iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso" +iso_url = "https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/debian-11.8.0-amd64-DVD-1.iso" iso_checksum = "file:https://cdimage.debian.org/cdimage/archive/latest-oldstable/amd64/iso-dvd/SHA256SUMS" parallels_guest_os_type = "debian" vbox_guest_os_type = "Debian_64" diff --git a/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl deleted file mode 100644 index b79ee2f48..000000000 --- a/os_pkrvars/freebsd/freebsd-12-aarch64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "freebsd" -os_version = "12.4" -os_arch = "aarch64" -iso_url = "https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-arm64-aarch64-disc1.iso" -iso_checksum = "file:https://download.freebsd.org/releases/arm64/aarch64/ISO-IMAGES/12.4/CHECKSUM.SHA256-FreeBSD-12.4-RELEASE-arm64-aarch64" -parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "arm-freebsd-64" -boot_command = ["boot -s/bin/shmdmfs -s 100m md1 /tmpmdmfs -s 100m md2 /mntdhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig"] diff --git a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl b/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl deleted file mode 100644 index 41181b3a9..000000000 --- a/os_pkrvars/freebsd/freebsd-12-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "freebsd" -os_version = "12.4" -os_arch = "x86_64" -iso_url = "https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-amd64-disc1.iso" -iso_checksum = "606435637b76991f96df68f561badf03266f3d5452e9f72ed9b130d96b188800" -parallels_guest_os_type = "freebsd" -vbox_guest_os_type = "FreeBSD_64" -vmware_guest_os_type = "freebsd-64" -boot_command = ["boot -s/bin/shmdmfs -s 100m md1 /tmpmdmfs -s 100m md2 /mntdhclient -p /tmp/dhclient.em0.pid -l /tmp/dhclient.lease.em0 em0fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd/installerconfig \u0026\u0026 bsdinstall script /tmp/installerconfig"] diff --git a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl index f95e9f8f7..dd1c6561d 100644 --- a/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u8/aarch64/OracleLinux-R8-U8-aarch64-dvd.iso" -iso_checksum = "6fe0c274b08084787f8d82d8cf2ff7893eea91f018c1f2d0c72383588b2fd480" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/aarch64/OracleLinux-R8-U9-aarch64-dvd.iso" +iso_checksum = "c732ec9bb4a85349c0f1ca82020a8514341247506d114b8b79ec32bf99d59ea0" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl index 3768bb278..af05d8767 100644 --- a/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-8-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u8/x86_64/OracleLinux-R8-U8-x86_64-dvd.iso" -iso_checksum = "cae39116245ff7c3c86d5305d9c11430ce5c4e512987563435ac59c37a082d7e" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL8/u9/x86_64/OracleLinux-R8-U9-x86_64-dvd.iso" +iso_checksum = "ce90b598be2e9889fa880128fc53b3e9c1f95d9e31859759e5e180602312c181" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl index 606a8d3cf..f5384427d 100644 --- a/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "9.2" +os_version = "9.3" os_arch = "aarch64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/aarch64/OracleLinux-R9-U2-aarch64-dvd.iso" -iso_checksum = "412f1a5e90d11313735a2a98a977f82d0d09642e3ab14a03da36d4e2b0b0d275" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/aarch64/OracleLinux-R9-U3-aarch64-dvd.iso" +iso_checksum = "7cc50a48f361cb1100a28621ba455edaac3a38182f6dd3fe67588b3eeaf18dc3" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "arm-centos-64" diff --git a/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl b/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl index 9bb6e5078..b76944965 100644 --- a/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/oracle/oracle-9-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "oracle" -os_version = "9.2" +os_version = "9.3" os_arch = "x86_64" -iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/x86_64/OracleLinux-R9-U2-x86_64-dvd.iso" -iso_checksum = "cac3c41cc2d3467ba8902a5d74575bcf460f129634d5a0d1d67d87094dd70b09" +iso_url = "https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-dvd.iso" +iso_checksum = "242f0ecc37417995137507862cb170215c0b5bd512c47badd16b623686ef39e2" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" vmware_guest_os_type = "centos-64" diff --git a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl index 03b29e385..0785f59d0 100644 --- a/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl index 29168e5db..0d939441b 100644 --- a/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-8-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl index 7223a554a..345324625 100644 --- a/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-aarch64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.2" +os_version = "9.3" os_arch = "aarch64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl index 434e0c5f8..aac6e2b5d 100644 --- a/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl +++ b/os_pkrvars/rhel/rhel-9-x86_64.pkrvars.hcl @@ -1,5 +1,5 @@ os_name = "rhel" -os_version = "9.2" +os_version = "9.3" os_arch = "x86_64" iso_url = "https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" iso_checksum = "none" diff --git a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl index 5a8e84ba1..9a542230e 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-aarch64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.8" +os_version = "8.9" os_arch = "aarch64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.8-aarch64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/aarch64/Rocky-8.9-aarch64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/aarch64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl index 97dbf6978..e64db8fcd 100644 --- a/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl +++ b/os_pkrvars/rockylinux/rockylinux-8-x86_64.pkrvars.hcl @@ -1,7 +1,7 @@ os_name = "rockylinux" -os_version = "8.8" +os_version = "8.9" os_arch = "x86_64" -iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.8-x86_64-minimal.iso" +iso_url = "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.9-x86_64-minimal.iso" iso_checksum = "file:https://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM" parallels_guest_os_type = "centos" vbox_guest_os_type = "RedHat_64" diff --git a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl b/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl deleted file mode 100644 index 90f2d7d52..000000000 --- a/os_pkrvars/scientificlinux/scientificlinux-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "scientificlinux" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "http://www.gtlib.gatech.edu/pub/scientific/7.9/x86_64/iso/SL-7-DVD-x86_64.iso" -iso_checksum = "7ac643e164c4a0da0b9f33411c68368cf908e0c34254904044957a3ca7793934" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = [" inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rhel/7ks.cfg"] diff --git a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl index 4cb327e06..4d9b85d40 100644 --- a/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl +++ b/os_pkrvars/sles/sles-15-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "suse" -os_version = "15.4" +os_version = "15.5" os_arch = "x86_64" -iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP4/x86_64/iso/SLE-15-SP4-Online-x86_64-GM-Media1.iso" -iso_checksum = "c0ceebe14d23c6c9484a1594fc5159225292f0847f7f15046f45a83319536d0e" +iso_url = "https://updates.suse.com/SUSE/Products/SLE-Product-SLES/15-SP5/x86_64/iso/SLE-15-SP5-Online-x86_64-GM-Media1.iso" +iso_checksum = "" parallels_guest_os_type = "suse" vbox_guest_os_type = "SUSE_LE_64" vmware_guest_os_type = "sles15-64" diff --git a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl deleted file mode 100644 index 3c35a3201..000000000 --- a/os_pkrvars/springdalelinux/springdalelinux-7-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "springdalelinux" -os_version = "7.9" -os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/7/x86_64/iso/Springdale%20Linux-7.9-x86_64-netinst.iso" -iso_checksum = "ad47807e17f796bdca35bb3ec5b65f1340d43b698ee04dcf60faecc8c6818c67" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = [" inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/7ks.cfg"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl deleted file mode 100644 index 443cd96ce..000000000 --- a/os_pkrvars/springdalelinux/springdalelinux-8-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "springdalelinux" -os_version = "8.8" -os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/8/x86_64/iso/Springdale%20Linux-8.8-x86_64-netinst.iso" -iso_checksum = "8bd617eb9fb050387fdf5abd9445722a1ef247523f2aa66d9cd9f952fbc9f6ff" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = [" inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/8ks.cfg"] diff --git a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl b/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl deleted file mode 100644 index 22c7d987c..000000000 --- a/os_pkrvars/springdalelinux/springdalelinux-9-x86_64.pkrvars.hcl +++ /dev/null @@ -1,9 +0,0 @@ -os_name = "springdalelinux" -os_version = "9.2" -os_arch = "x86_64" -iso_url = "http://springdale.princeton.edu/data/springdale/9/x86_64/iso/Springdale%20Linux-9.2-x86_64-netinst.iso" -iso_checksum = "88138260fec7898decf421fe0ae53953f9512c68009dd24cbd897ce226c6295d" -parallels_guest_os_type = "centos" -vbox_guest_os_type = "RedHat_64" -vmware_guest_os_type = "centos-64" -boot_command = [" inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/springdalelinux/9ks.cfg"] diff --git a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl index 2ab4099ce..f24afed1b 100644 --- a/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl @@ -2,7 +2,7 @@ os_name = "ubuntu" os_version = "20.04" os_arch = "aarch64" iso_url = "http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.5-live-server-arm64.iso" -iso_checksum = "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b9ea3e60ce35bebdedf" +iso_checksum = "file:https://cdimage.ubuntu.com/releases/focal/release/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl similarity index 69% rename from os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl rename to os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl index a4d080aeb..770a5671a 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.04-aarch64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-23.10-aarch64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" -os_version = "23.04" +os_version = "23.10" os_arch = "aarch64" -iso_url = "https://cdimage.ubuntu.com/releases/lunar/release/ubuntu-23.04-live-server-arm64.iso" -iso_checksum = "file:https://cdimage.ubuntu.com/releases/lunar/release/SHA256SUMS" +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" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "arm-ubuntu-64" diff --git a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl b/os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl similarity index 61% rename from os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl rename to os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl index b63e4dd21..43a2a3941 100644 --- a/os_pkrvars/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl +++ b/os_pkrvars/ubuntu/ubuntu-23.10-x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ os_name = "ubuntu" -os_version = "23.04" +os_version = "23.10" os_arch = "x86_64" -iso_url = "https://releases.ubuntu.com/lunar/ubuntu-23.04-live-server-amd64.iso" -iso_checksum = "file:https://releases.ubuntu.com/lunar/SHA256SUMS" +iso_url = "https://releases.ubuntu.com/mantic/ubuntu-23.10-live-server-amd64.iso" +iso_checksum = "file:https://releases.ubuntu.com/mantic/SHA256SUMS" parallels_guest_os_type = "ubuntu" vbox_guest_os_type = "Ubuntu_64" vmware_guest_os_type = "ubuntu-64"