From 731f754bf5f46961036f80054b658ded2a3eb4c9 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 8 Jun 2025 22:54:48 +1000 Subject: [PATCH] feat: migrate 9.5 to 9.6 - replace almalinux 9.5 with almalinux 9.6 - upgrade el8.10 epel repo to use packagerepo - add version to all el8.10 images to force a rebuild --- images/almalinux/{9.5 => 8.10}/actionsdind/version | 0 images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo | 4 ++-- images/almalinux/{9.5 => 8.10}/base/version | 0 .../almalinux/{9.5/puppet-base => 8.10/jupyterlab}/version | 0 images/almalinux/8.10/rpmbuilder/version | 1 + .../almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo | 6 ------ images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo | 6 ------ images/almalinux/9.5/base/files/etc/yum.repos.d/epel.repo | 6 ------ images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo | 6 ------ .../9.5/base/files/etc/yum.repos.d/highavailability.repo | 4 ---- images/almalinux/9.5/jupyterlab/version | 1 - images/almalinux/9.5/rpmbuilder/version | 1 - images/almalinux/{9.5 => 9.6}/actionsdind/builds | 0 .../{9.5 => 9.6}/actionsdind/variables.auto.pkrvars.hcl | 0 images/almalinux/9.6/actionsdind/version | 1 + images/almalinux/{9.5 => 9.6}/base/builds | 0 .../almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo | 6 ++++++ images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo | 6 ++++++ .../{9.5 => 9.6}/base/files/etc/yum.repos.d/crb.repo | 4 ++-- images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo | 6 ++++++ images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo | 6 ++++++ .../9.6/base/files/etc/yum.repos.d/highavailability.repo | 4 ++++ .../{9.5 => 9.6}/base/files/etc/yum.repos.d/unkin.repo | 0 .../almalinux/{9.5 => 9.6}/base/variables.auto.pkrvars.hcl | 0 images/almalinux/9.6/base/version | 1 + images/almalinux/{9.5 => 9.6}/jupyterlab/builds | 0 .../{9.5 => 9.6}/jupyterlab/variables.auto.pkrvars.hcl | 0 images/almalinux/9.6/jupyterlab/version | 1 + images/almalinux/{9.5 => 9.6}/puppet-base/builds | 0 .../puppet-base/files/etc/skel/.config/htop/htoprc | 0 .../puppet-base/files/etc/yum.repos.d/puppet.repo | 0 .../{9.5 => 9.6}/puppet-base/variables.auto.pkrvars.hcl | 0 images/almalinux/9.6/puppet-base/version | 1 + images/almalinux/{9.5 => 9.6}/rpmbuilder/builds | 0 .../{9.5 => 9.6}/rpmbuilder/variables.auto.pkrvars.hcl | 0 images/almalinux/9.6/rpmbuilder/version | 1 + 36 files changed, 38 insertions(+), 34 deletions(-) rename images/almalinux/{9.5 => 8.10}/actionsdind/version (100%) rename images/almalinux/{9.5 => 8.10}/base/version (100%) rename images/almalinux/{9.5/puppet-base => 8.10/jupyterlab}/version (100%) create mode 100644 images/almalinux/8.10/rpmbuilder/version delete mode 100644 images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo delete mode 100644 images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo delete mode 100644 images/almalinux/9.5/base/files/etc/yum.repos.d/epel.repo delete mode 100644 images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo delete mode 100644 images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo delete mode 100644 images/almalinux/9.5/jupyterlab/version delete mode 100644 images/almalinux/9.5/rpmbuilder/version rename images/almalinux/{9.5 => 9.6}/actionsdind/builds (100%) rename images/almalinux/{9.5 => 9.6}/actionsdind/variables.auto.pkrvars.hcl (100%) create mode 100644 images/almalinux/9.6/actionsdind/version rename images/almalinux/{9.5 => 9.6}/base/builds (100%) create mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo create mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo rename images/almalinux/{9.5 => 9.6}/base/files/etc/yum.repos.d/crb.repo (52%) create mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo create mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo create mode 100644 images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo rename images/almalinux/{9.5 => 9.6}/base/files/etc/yum.repos.d/unkin.repo (100%) rename images/almalinux/{9.5 => 9.6}/base/variables.auto.pkrvars.hcl (100%) create mode 100644 images/almalinux/9.6/base/version rename images/almalinux/{9.5 => 9.6}/jupyterlab/builds (100%) rename images/almalinux/{9.5 => 9.6}/jupyterlab/variables.auto.pkrvars.hcl (100%) create mode 100644 images/almalinux/9.6/jupyterlab/version rename images/almalinux/{9.5 => 9.6}/puppet-base/builds (100%) rename images/almalinux/{9.5 => 9.6}/puppet-base/files/etc/skel/.config/htop/htoprc (100%) rename images/almalinux/{9.5 => 9.6}/puppet-base/files/etc/yum.repos.d/puppet.repo (100%) rename images/almalinux/{9.5 => 9.6}/puppet-base/variables.auto.pkrvars.hcl (100%) create mode 100644 images/almalinux/9.6/puppet-base/version rename images/almalinux/{9.5 => 9.6}/rpmbuilder/builds (100%) rename images/almalinux/{9.5 => 9.6}/rpmbuilder/variables.auto.pkrvars.hcl (100%) create mode 100644 images/almalinux/9.6/rpmbuilder/version diff --git a/images/almalinux/9.5/actionsdind/version b/images/almalinux/8.10/actionsdind/version similarity index 100% rename from images/almalinux/9.5/actionsdind/version rename to images/almalinux/8.10/actionsdind/version diff --git a/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo b/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo index 0ad2389..a0b411b 100644 --- a/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo +++ b/images/almalinux/8.10/base/files/etc/yum.repos.d/epel.repo @@ -1,6 +1,6 @@ [epel] name=epel repository -baseurl=https://edgecache.query.consul/epel/8/Everything/x86_64 -gpgkey=https://edgecache.query.consul/epel/RPM-GPG-KEY-EPEL-8 +baseurl=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-8 enabled=1 gpgcheck=1 diff --git a/images/almalinux/9.5/base/version b/images/almalinux/8.10/base/version similarity index 100% rename from images/almalinux/9.5/base/version rename to images/almalinux/8.10/base/version diff --git a/images/almalinux/9.5/puppet-base/version b/images/almalinux/8.10/jupyterlab/version similarity index 100% rename from images/almalinux/9.5/puppet-base/version rename to images/almalinux/8.10/jupyterlab/version diff --git a/images/almalinux/8.10/rpmbuilder/version b/images/almalinux/8.10/rpmbuilder/version new file mode 100644 index 0000000..800deb1 --- /dev/null +++ b/images/almalinux/8.10/rpmbuilder/version @@ -0,0 +1 @@ +20250608 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo deleted file mode 100644 index e5ba825..0000000 --- a/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo +++ /dev/null @@ -1,6 +0,0 @@ -[appstream] -name=appstream repository -baseurl=https://packagerepo.service.consul/almalinux/9.5/appstream-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.5/appstream-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo deleted file mode 100644 index 77e69d5..0000000 --- a/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo +++ /dev/null @@ -1,6 +0,0 @@ -[baseos] -name=baseos repository -baseurl=https://packagerepo.service.consul/almalinux/9.5/baseos-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.5/baseos-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/epel.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/epel.repo deleted file mode 100644 index b65fa74..0000000 --- a/images/almalinux/9.5/base/files/etc/yum.repos.d/epel.repo +++ /dev/null @@ -1,6 +0,0 @@ -[epel] -name=epel repository -baseurl=https://edgecache.query.consul/epel/9/Everything/x86_64 -gpgkey=https://edgecache.query.consul/epel/RPM-GPG-KEY-EPEL-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo deleted file mode 100644 index 9cfec1c..0000000 --- a/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo +++ /dev/null @@ -1,6 +0,0 @@ -[extras] -name=extras repository -baseurl=https://packagerepo.service.consul/almalinux/9.5/extras-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.5/extras-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 -enabled=1 -gpgcheck=1 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo deleted file mode 100644 index b3d77ad..0000000 --- a/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo +++ /dev/null @@ -1,4 +0,0 @@ -[ha] -name=ha repository -baseurl=https://packagerepo.service.consul/almalinux/9.5/ha-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.5/ha-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 diff --git a/images/almalinux/9.5/jupyterlab/version b/images/almalinux/9.5/jupyterlab/version deleted file mode 100644 index 87d53b3..0000000 --- a/images/almalinux/9.5/jupyterlab/version +++ /dev/null @@ -1 +0,0 @@ -20250525 diff --git a/images/almalinux/9.5/rpmbuilder/version b/images/almalinux/9.5/rpmbuilder/version deleted file mode 100644 index 87d53b3..0000000 --- a/images/almalinux/9.5/rpmbuilder/version +++ /dev/null @@ -1 +0,0 @@ -20250525 diff --git a/images/almalinux/9.5/actionsdind/builds b/images/almalinux/9.6/actionsdind/builds similarity index 100% rename from images/almalinux/9.5/actionsdind/builds rename to images/almalinux/9.6/actionsdind/builds diff --git a/images/almalinux/9.5/actionsdind/variables.auto.pkrvars.hcl b/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl similarity index 100% rename from images/almalinux/9.5/actionsdind/variables.auto.pkrvars.hcl rename to images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl diff --git a/images/almalinux/9.6/actionsdind/version b/images/almalinux/9.6/actionsdind/version new file mode 100644 index 0000000..800deb1 --- /dev/null +++ b/images/almalinux/9.6/actionsdind/version @@ -0,0 +1 @@ +20250608 diff --git a/images/almalinux/9.5/base/builds b/images/almalinux/9.6/base/builds similarity index 100% rename from images/almalinux/9.5/base/builds rename to images/almalinux/9.6/base/builds diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo new file mode 100644 index 0000000..67f0e74 --- /dev/null +++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/appstream.repo @@ -0,0 +1,6 @@ +[appstream] +name=appstream repository +baseurl=https://packagerepo.service.consul/almalinux/9.6/appstream-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/almalinux/9.6/appstream-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo new file mode 100644 index 0000000..4bc0999 --- /dev/null +++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/baseos.repo @@ -0,0 +1,6 @@ +[baseos] +name=baseos repository +baseurl=https://packagerepo.service.consul/almalinux/9.6/baseos-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/almalinux/9.6/baseos-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo similarity index 52% rename from images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo rename to images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo index 5a3dff5..70298d9 100644 --- a/images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo +++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/crb.repo @@ -1,7 +1,7 @@ # new repo for EL9+, replaces PowerTools repo [crb] name=crb repository -baseurl=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/ -gpgkey=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +baseurl=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 enabled=1 gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo new file mode 100644 index 0000000..abb3a97 --- /dev/null +++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/epel.repo @@ -0,0 +1,6 @@ +[epel] +name=epel repository +baseurl=https://packagerepo.service.consul/epel/9/everything-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/epel/9/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo new file mode 100644 index 0000000..21bf850 --- /dev/null +++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/extras.repo @@ -0,0 +1,6 @@ +[extras] +name=extras repository +baseurl=https://packagerepo.service.consul/almalinux/9.6/extras-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/almalinux/9.6/extras-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 +enabled=1 +gpgcheck=1 diff --git a/images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo new file mode 100644 index 0000000..92ea6c5 --- /dev/null +++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/highavailability.repo @@ -0,0 +1,4 @@ +[ha] +name=ha repository +baseurl=https://packagerepo.service.consul/almalinux/9.6/ha-daily/x86_64/os/ +gpgkey=https://packagerepo.service.consul/almalinux/9.6/ha-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9 diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/unkin.repo b/images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo similarity index 100% rename from images/almalinux/9.5/base/files/etc/yum.repos.d/unkin.repo rename to images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo diff --git a/images/almalinux/9.5/base/variables.auto.pkrvars.hcl b/images/almalinux/9.6/base/variables.auto.pkrvars.hcl similarity index 100% rename from images/almalinux/9.5/base/variables.auto.pkrvars.hcl rename to images/almalinux/9.6/base/variables.auto.pkrvars.hcl diff --git a/images/almalinux/9.6/base/version b/images/almalinux/9.6/base/version new file mode 100644 index 0000000..800deb1 --- /dev/null +++ b/images/almalinux/9.6/base/version @@ -0,0 +1 @@ +20250608 diff --git a/images/almalinux/9.5/jupyterlab/builds b/images/almalinux/9.6/jupyterlab/builds similarity index 100% rename from images/almalinux/9.5/jupyterlab/builds rename to images/almalinux/9.6/jupyterlab/builds diff --git a/images/almalinux/9.5/jupyterlab/variables.auto.pkrvars.hcl b/images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl similarity index 100% rename from images/almalinux/9.5/jupyterlab/variables.auto.pkrvars.hcl rename to images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl diff --git a/images/almalinux/9.6/jupyterlab/version b/images/almalinux/9.6/jupyterlab/version new file mode 100644 index 0000000..800deb1 --- /dev/null +++ b/images/almalinux/9.6/jupyterlab/version @@ -0,0 +1 @@ +20250608 diff --git a/images/almalinux/9.5/puppet-base/builds b/images/almalinux/9.6/puppet-base/builds similarity index 100% rename from images/almalinux/9.5/puppet-base/builds rename to images/almalinux/9.6/puppet-base/builds diff --git a/images/almalinux/9.5/puppet-base/files/etc/skel/.config/htop/htoprc b/images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc similarity index 100% rename from images/almalinux/9.5/puppet-base/files/etc/skel/.config/htop/htoprc rename to images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc diff --git a/images/almalinux/9.5/puppet-base/files/etc/yum.repos.d/puppet.repo b/images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo similarity index 100% rename from images/almalinux/9.5/puppet-base/files/etc/yum.repos.d/puppet.repo rename to images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo diff --git a/images/almalinux/9.5/puppet-base/variables.auto.pkrvars.hcl b/images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl similarity index 100% rename from images/almalinux/9.5/puppet-base/variables.auto.pkrvars.hcl rename to images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl diff --git a/images/almalinux/9.6/puppet-base/version b/images/almalinux/9.6/puppet-base/version new file mode 100644 index 0000000..800deb1 --- /dev/null +++ b/images/almalinux/9.6/puppet-base/version @@ -0,0 +1 @@ +20250608 diff --git a/images/almalinux/9.5/rpmbuilder/builds b/images/almalinux/9.6/rpmbuilder/builds similarity index 100% rename from images/almalinux/9.5/rpmbuilder/builds rename to images/almalinux/9.6/rpmbuilder/builds diff --git a/images/almalinux/9.5/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl similarity index 100% rename from images/almalinux/9.5/rpmbuilder/variables.auto.pkrvars.hcl rename to images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl diff --git a/images/almalinux/9.6/rpmbuilder/version b/images/almalinux/9.6/rpmbuilder/version new file mode 100644 index 0000000..800deb1 --- /dev/null +++ b/images/almalinux/9.6/rpmbuilder/version @@ -0,0 +1 @@ +20250608