From 04dcb34edd2c234b378222d2f9a17e15c0dad936 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 4 Jun 2024 11:23:16 -0400 Subject: [PATCH 1/3] Update repo info for opstools Centos8s went EOL on 31.05.2024 so the packages have been moved to centos vault mirror the repo config we use needs to be updated --- build/repos/opstools.repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/repos/opstools.repo b/build/repos/opstools.repo index aee21884..2d95a92d 100644 --- a/build/repos/opstools.repo +++ b/build/repos/opstools.repo @@ -11,8 +11,8 @@ enabled=0 [centos-opstools] name=CentOS-OpsTools - collectd -mirrorlist=http://mirrorlist.centos.org/?arch=$basearch&release=$releasever-stream&repo=opstools-collectd-5 -#baseurl=http://mirror.centos.org/$contentdir/$releasever-stream/opstools/$basearch/collectd-5/ +#mirrorlist=http://mirrorlist.centos.org/?arch=$basearch&release=$releasever-stream&repo=opstools-collectd-5 +baseurl=http://vault.centos.org/$releasever-stream/opstools/$basearch/collectd-5/ gpgcheck=0 enabled=1 skip_if_unavailable=1 From f20ff64891a87b51be09e784fb73763e064d101b Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Tue, 4 Jun 2024 15:30:33 -0400 Subject: [PATCH 2/3] Temporary value to test new opstool repo defs in GHA tests --- .github/workflows/integration.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 70ad60ec..56d146d6 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,7 +1,7 @@ name: Integration testing env: PROJECT_ROOT: /root/go/src/github.com/infrawatch/sg-core - OPSTOOLS_REPO: https://git.centos.org/rpms/centos-release-opstools/raw/c8s-sig-opstools/f/SOURCES/CentOS-OpsTools.repo + OPSTOOLS_REPO: https://raw.githubusercontent.com/infrawatch/sg-core/04dcb34edd2c234b378222d2f9a17e15c0dad936/build/repos/opstools.repo QDR_IMAGE: quay.io/interconnectedcloud/qdrouterd:1.17.0 QDR_VOLUME: "--volume=${{ github.workspace }}/ci/service_configs/qdr:/etc/qpid-dispatch:ro" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4b5bfa4a..91f52ff0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,7 +1,7 @@ name: CI env: PROJECT_ROOT: /root/go/src/github.com/infrawatch/sg-core - OPSTOOLS_REPO: https://git.centos.org/rpms/centos-release-opstools/raw/c8s-sig-opstools/f/SOURCES/CentOS-OpsTools.repo + OPSTOOLS_REPO: https://raw.githubusercontent.com/infrawatch/sg-core/04dcb34edd2c234b378222d2f9a17e15c0dad936/build/repos/opstools.repo LOKI_IMAGE: quay.io/infrawatch/loki:2.4.2 LOKI_VOLUME: "--volume=${{ github.workspace }}/ci/service_configs/loki:/etc/loki:ro" From d8ffe88341407924ef4cdd8723e03072a2b416d6 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 4 Jun 2024 15:34:08 -0400 Subject: [PATCH 3/3] [ci] Update integration tests to use vault mirror CentOS 8 Stream is EOL since 31-05-2024 --- ci/integration/logging/run_sg.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/integration/logging/run_sg.sh b/ci/integration/logging/run_sg.sh index c6160aad..eb23fe19 100644 --- a/ci/integration/logging/run_sg.sh +++ b/ci/integration/logging/run_sg.sh @@ -7,6 +7,9 @@ set -ex # enable required repo(s) curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo +# Update to use the vault mirror since Centos 8s is EOL +sed -i 's/^#baseurl.*$/baseurl=http:\/\/vault.centos.org\/$releasever-stream\/opstools\/$basearch\/collectd-5/g' /etc/yum.repos.d/CentOS-OpsTools.repo +sed -i 's/^mirror/#mirror/g' /etc/yum.repos.d/CentOS-OpsTools.repo dnf install -y git golang gcc make qpid-proton-c-devel