feat: update repos for el9
All checks were successful
Build / build (pull_request) Successful in 46s

- changed from edgecache to packagerepo for el9.4/9.5
- changed to vault.service.consul
- disable running incus builds currently
This commit is contained in:
Ben Vincent 2025-05-25 10:26:27 +10:00
parent 44e1ecc84e
commit e061eb52e7
9 changed files with 25 additions and 15 deletions

View File

@ -50,7 +50,7 @@ $(DIRS):
@echo "Building for $@" @echo "Building for $@"
# Export environment # Export environment
export VAULT_ADDR=https://vault.query.consul:8200 export VAULT_ADDR=https://vault.service.consul:8200
export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \ export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
eval $$(vault kv get -format=json kv/service/packer/builder/env | jq -r '.data.data | to_entries[] | "export \(.key)=\(.value)"') eval $$(vault kv get -format=json kv/service/packer/builder/env | jq -r '.data.data | to_entries[] | "export \(.key)=\(.value)"')
@ -91,7 +91,7 @@ $(DIRS):
export SUFFIX=$(SUFFIX) && \ export SUFFIX=$(SUFFIX) && \
export GIT_COMMIT=$(GIT_COMMIT) && \ export GIT_COMMIT=$(GIT_COMMIT) && \
export GIT_BRANCH=$(GIT_BRANCH) && \ export GIT_BRANCH=$(GIT_BRANCH) && \
export VAULT_ADDR=https://vault.query.consul:8200 export VAULT_ADDR=https://vault.service.consul:8200
export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \ export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
/usr/bin/packer init . && \ /usr/bin/packer init . && \
/usr/bin/packer build . ) /usr/bin/packer build . )

View File

@ -9,6 +9,7 @@ packages = [
"incus-client", "incus-client",
"incus-tools", "incus-tools",
"nodejs", "nodejs",
"nomad",
"packer", "packer",
"terraform", "terraform",
"terragrunt", "terragrunt",
@ -16,6 +17,8 @@ packages = [
"vault" "vault"
] ]
scripts_pre_packages = [ scripts_pre_packages = [
"dnf makecache",
"dnf update -y",
"dnf install -y yum-utils", "dnf install -y yum-utils",
"dnf module enable -y nodejs:20", "dnf module enable -y nodejs:20",
"yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo" "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo"

View File

@ -1,2 +1 @@
docker docker
incus

View File

@ -1,6 +1,6 @@
[appstream] [appstream]
name=appstream repository name=appstream repository
baseurl=https://edgecache.query.consul/almalinux/9.5/AppStream/x86_64/os baseurl=https://packagerepo.service.consul/almalinux/9.5/appstream-daily/x86_64/os/
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9 gpgkey=https://packagerepo.service.consul/almalinux/9.5/appstream-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1

View File

@ -1,6 +1,6 @@
[baseos] [baseos]
name=baseos repository name=baseos repository
baseurl=https://edgecache.query.consul/almalinux/9.5/BaseOS/x86_64/os baseurl=https://packagerepo.service.consul/almalinux/9.5/baseos-daily/x86_64/os/
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9 gpgkey=https://packagerepo.service.consul/almalinux/9.5/baseos-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1

View File

@ -1,5 +1,7 @@
# new repo for EL9+, replaces PowerTools repo # new repo for EL9+, replaces PowerTools repo
[crb] [crb]
name=crb repository name=crb repository
baseurl=https://edgecache.query.consul/almalinux/9.5/CRB/x86_64/os baseurl=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9 gpgkey=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1
gpgcheck=1

View File

@ -1,4 +1,6 @@
[extras] [extras]
name=extras repository name=extras repository
baseurl=https://edgecache.query.consul/almalinux/9.5/extras/x86_64/os baseurl=https://packagerepo.service.consul/almalinux/9.5/extras-daily/x86_64/os/
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9 gpgkey=https://packagerepo.service.consul/almalinux/9.5/extras-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
enabled=1
gpgcheck=1

View File

@ -1,4 +1,4 @@
[highavailability] [ha]
name=highavailability repository name=ha repository
baseurl=https://edgecache.query.consul/almalinux/9.5/HighAvailability/x86_64/os baseurl=https://packagerepo.service.consul/almalinux/9.5/ha-daily/x86_64/os/
gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9 gpgkey=https://packagerepo.service.consul/almalinux/9.5/ha-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9

View File

@ -40,6 +40,10 @@ packages = [
"valgrind", "valgrind",
"valgrind-devel", "valgrind-devel",
] ]
scripts_pre_packages = [
"dnf makecache",
"dnf update -y",
]
scripts_final = [ scripts_final = [
"dnf clean all", "dnf clean all",
"rm -rf /var/cache/dnf" "rm -rf /var/cache/dnf"