From 1fe7a0bd46ae48a1079a00eecb912d6de212b25f Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 29 Apr 2025 02:11:45 -0700 Subject: [PATCH 1/2] Add Debian 13 Using the pre-release version of Trixie until it's out. --- .../platform/defaults/debian-13-aarch64.rb | 26 +++++++++++++++++++ .../platform/defaults/debian-13-amd64.rb | 26 +++++++++++++++++++ lib/vanagon/platform/defaults/el-10-x86_64.rb | 3 ++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 lib/vanagon/platform/defaults/debian-13-aarch64.rb create mode 100644 lib/vanagon/platform/defaults/debian-13-amd64.rb diff --git a/lib/vanagon/platform/defaults/debian-13-aarch64.rb b/lib/vanagon/platform/defaults/debian-13-aarch64.rb new file mode 100644 index 00000000..740508b2 --- /dev/null +++ b/lib/vanagon/platform/defaults/debian-13-aarch64.rb @@ -0,0 +1,26 @@ +platform "debian-13-aarch64" do |plat| + plat.servicedir "/lib/systemd/system" + plat.defaultdir "/etc/default" + plat.servicetype "systemd" + plat.codename "trixie" + + packages = %w( + build-essential + cmake + curl + debhelper + devscripts + fakeroot + make + pkg-config + quilt + rsync + systemd + ) + plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}" + plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends " + plat.vmpooler_template "debian-13-arm64" + # Change to "debian:13" on final release + plat.docker_image "debian:trixie" + plat.docker_arch "linux/arm64" +end diff --git a/lib/vanagon/platform/defaults/debian-13-amd64.rb b/lib/vanagon/platform/defaults/debian-13-amd64.rb new file mode 100644 index 00000000..54914987 --- /dev/null +++ b/lib/vanagon/platform/defaults/debian-13-amd64.rb @@ -0,0 +1,26 @@ +platform "debian-13-amd64" do |plat| + plat.servicedir "/lib/systemd/system" + plat.defaultdir "/etc/default" + plat.servicetype "systemd" + plat.codename "bookworm" + + packages = %w( + build-essential + cmake + curl + debhelper + devscripts + fakeroot + make + pkg-config + quilt + rsync + systemd + ) + plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}" + plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends " + plat.vmpooler_template "debian-13-x86_64" + # Change to "debian:13" on final release + plat.docker_image "debian:trixie" + plat.docker_arch "linux/amd64" +end diff --git a/lib/vanagon/platform/defaults/el-10-x86_64.rb b/lib/vanagon/platform/defaults/el-10-x86_64.rb index 85f05f37..f587f867 100644 --- a/lib/vanagon/platform/defaults/el-10-x86_64.rb +++ b/lib/vanagon/platform/defaults/el-10-x86_64.rb @@ -23,7 +23,8 @@ ) plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')} && dnf config-manager --set-enabled crb" plat.install_build_dependencies_with "dnf install -y --allowerasing " - plat.vmpooler_template "redhat-9-x86_64" + plat.vmpooler_template "redhat-10-x86_64" + # Change to almalinux:10 on release plat.docker_image "almalinux:10-kitten" plat.docker_arch "linux/amd64" end From 534d320fa55f35d733166dfa5edcc502a8899d52 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 29 Apr 2025 02:26:22 -0700 Subject: [PATCH 2/2] Add amazon-2-x86_64 --- .../platform/defaults/amazon-2-x86_64.rb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 lib/vanagon/platform/defaults/amazon-2-x86_64.rb diff --git a/lib/vanagon/platform/defaults/amazon-2-x86_64.rb b/lib/vanagon/platform/defaults/amazon-2-x86_64.rb new file mode 100644 index 00000000..35eea82e --- /dev/null +++ b/lib/vanagon/platform/defaults/amazon-2-x86_64.rb @@ -0,0 +1,27 @@ +platform "amazon-2-x86_64" do |plat| + plat.servicedir "/usr/lib/systemd/system" + plat.defaultdir "/etc/sysconfig" + plat.servicetype "systemd" + + packages = %w( + autoconf + automake + cmake3 + createrepo + curl + gcc + gcc-c++ + libtool + libarchive + make + rpm-libs + rpm-build + rsync + systemd + which + ) + plat.provision_with("yum install -y --nogpgcheck #{packages.join(' ')}") + plat.install_build_dependencies_with "yum install --assumeyes" + plat.docker_image "amazonlinux:2" + plat.docker_arch "linux/amd64" +end