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
2025-06-08 22:54:48 +10:00 · 2025-06-08 22:54:48 +10:00 · 731f754bf5
commit 731f754bf5
parent 8b7030eda5
36 changed files with 38 additions and 34 deletions
--- a/images/almalinux/8.10/actionsdind/version
+++ b/images/almalinux/8.10/actionsdind/version
--- 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
+baseurl=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/
-gpgkey=https://edgecache.query.consul/epel/RPM-GPG-KEY-EPEL-8
+gpgkey=https://packagerepo.service.consul/epel/8/everything-daily/x86_64/os/RPM-GPG-KEY-EPEL-8
 enabled=1
 gpgcheck=1
--- a/images/almalinux/8.10/base/version
+++ b/images/almalinux/8.10/base/version
--- a/images/almalinux/8.10/jupyterlab/version
+++ b/images/almalinux/8.10/jupyterlab/version
--- a/images/almalinux/8.10/rpmbuilder/version
+++ b/images/almalinux/8.10/rpmbuilder/version
@ -0,0 +1 @@
 20250608
--- 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
@ -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
--- 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
@ -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
--- 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
@ -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
--- 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
@ -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
--- 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
@ -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
--- a/images/almalinux/9.5/jupyterlab/version
+++ b/images/almalinux/9.5/jupyterlab/version
@ -1 +0,0 @@
 20250525
--- a/images/almalinux/9.5/rpmbuilder/version
+++ b/images/almalinux/9.5/rpmbuilder/version
@ -1 +0,0 @@
 20250525
--- a/images/almalinux/9.6/actionsdind/builds
+++ b/images/almalinux/9.6/actionsdind/builds
--- a/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl
--- a/images/almalinux/9.6/actionsdind/version
+++ b/images/almalinux/9.6/actionsdind/version
@ -0,0 +1 @@
 20250608
--- a/images/almalinux/9.6/base/builds
+++ b/images/almalinux/9.6/base/builds
--- 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
@ -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
--- 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
@ -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
--- a/images/almalinux/9.6/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/
+baseurl=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/
-gpgkey=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+gpgkey=https://packagerepo.service.consul/almalinux/9.6/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
--- 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
@ -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
--- 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
@ -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
--- 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
@ -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
--- a/images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo
+++ b/images/almalinux/9.6/base/files/etc/yum.repos.d/unkin.repo
--- a/images/almalinux/9.6/base/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.6/base/variables.auto.pkrvars.hcl
--- a/images/almalinux/9.6/base/version
+++ b/images/almalinux/9.6/base/version
@ -0,0 +1 @@
 20250608
--- a/images/almalinux/9.6/jupyterlab/builds
+++ b/images/almalinux/9.6/jupyterlab/builds
--- a/images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.6/jupyterlab/variables.auto.pkrvars.hcl
--- a/images/almalinux/9.6/jupyterlab/version
+++ b/images/almalinux/9.6/jupyterlab/version
@ -0,0 +1 @@
 20250608
--- a/images/almalinux/9.6/puppet-base/builds
+++ b/images/almalinux/9.6/puppet-base/builds
--- a/images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc
+++ b/images/almalinux/9.6/puppet-base/files/etc/skel/.config/htop/htoprc
--- a/images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo
+++ b/images/almalinux/9.6/puppet-base/files/etc/yum.repos.d/puppet.repo
--- a/images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.6/puppet-base/variables.auto.pkrvars.hcl
--- a/images/almalinux/9.6/puppet-base/version
+++ b/images/almalinux/9.6/puppet-base/version
@ -0,0 +1 @@
 20250608
--- a/images/almalinux/9.6/rpmbuilder/builds
+++ b/images/almalinux/9.6/rpmbuilder/builds
--- a/images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.6/rpmbuilder/variables.auto.pkrvars.hcl
--- a/images/almalinux/9.6/rpmbuilder/version
+++ b/images/almalinux/9.6/rpmbuilder/version
@ -0,0 +1 @@
 20250608