From fc829e26845b92d5028e2c03ea18081a8657edeb Mon Sep 17 00:00:00 2001 From: "vimartin@redhat.com" Date: Thu, 15 Aug 2024 08:06:39 +0200 Subject: [PATCH 1/3] Migrate to RHEL9 Use ubi9 as base image and include OpenStack repos --- build/Dockerfile | 4 ++-- build/repos/opstools.repo | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 0cab30b..3a95b6e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ # --- Build the bridge -FROM registry.access.redhat.com/ubi8 AS builder +FROM registry.access.redhat.com/ubi9 AS builder # dependencies for qpid-proton-c COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo @@ -20,7 +20,7 @@ RUN make && \ mv bridge /tmp/ # --- end build, create bridge runtime layer --- -FROM registry.access.redhat.com/ubi8 +FROM registry.access.redhat.com/ubi9 # dependencies for qpid-proton-c COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo diff --git a/build/repos/opstools.repo b/build/repos/opstools.repo index 2d95a92..f00fa33 100644 --- a/build/repos/opstools.repo +++ b/build/repos/opstools.repo @@ -1,19 +1,18 @@ -# CentOS-OpsTools.repo +# CentOS 9 OpenStack repos # -# Please see http://wiki.centos.org/SpecialInterestGroup/OpsTools for more -# information +# Please see https://trunk.rdoproject.org/ and +# https://trunk.rdoproject.org/centos9-caracal/report.html for more information -[centos-opstools-testing] -name=CentOS-OpsTools - testing repo -baseurl=https://buildlogs.centos.org/centos/$releasever-stream/opstools/$basearch/collectd-5/ +[delorean-caracal-testing] +name=dlrn-caracal-testing +baseurl=https://trunk.rdoproject.org/centos9-caracal/deps/latest/ +enabled=1 gpgcheck=0 -enabled=0 +module_hotfixes=1 -[centos-opstools] -name=CentOS-OpsTools - collectd -#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 +[centos9-opstools] +name=centos9-opstools +baseurl=http://mirror.stream.centos.org/SIGs/9-stream/opstools/$basearch/collectd-5/ enabled=1 -skip_if_unavailable=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools +gpgcheck=0 +module_hotfixes=1 From 0b123700d9049536f10f47cff9334120abf3597b Mon Sep 17 00:00:00 2001 From: "vimartin@redhat.com" Date: Mon, 19 Aug 2024 12:39:00 +0200 Subject: [PATCH 2/3] Use correct repo naming We are now consuming centos9-caracal repos (OpenStack repos) to get the required dependencies, so update the repo to centos9-caracal and all the references in the Github actions and integration scripts Also updates the Dockerfile to be more descriptive (use SGBRIDGE_DIR instead of D) --- build/Dockerfile | 10 +++++----- build/repos/{opstools.repo => centos9-caracal.repo} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename build/repos/{opstools.repo => centos9-caracal.repo} (100%) diff --git a/build/Dockerfile b/build/Dockerfile index 3a95b6e..a0e4a0b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi9 AS builder # dependencies for qpid-proton-c -COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo +COPY build/repos/centos9-caracal.repo /etc/yum.repos.d/centos9-caracal.repo # redhat-rpm-config is required to provide hardening compiling instructions # (such as /usr/lib/rpm/redhat/redhat-hardened-cc1) even though we're not @@ -11,10 +11,10 @@ RUN dnf install qpid-proton-c-devel --setopt=tsflags=nodocs -y && \ dnf install gcc make redhat-rpm-config -y && \ dnf clean all -ENV D=/home/bridge +ENV SGBRIDGE_DIR=/home/bridge -WORKDIR $D -COPY . $D/ +WORKDIR $SGBRIDGE_DIR +COPY . $SGBRIDGE_DIR/ RUN make && \ mv bridge /tmp/ @@ -23,7 +23,7 @@ RUN make && \ FROM registry.access.redhat.com/ubi9 # dependencies for qpid-proton-c -COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo +COPY build/repos/centos9-caracal.repo /etc/yum.repos.d/centos9-caracal.repo RUN dnf install qpid-proton-c --setopt=tsflags=nodocs -y && \ dnf clean all && \ diff --git a/build/repos/opstools.repo b/build/repos/centos9-caracal.repo similarity index 100% rename from build/repos/opstools.repo rename to build/repos/centos9-caracal.repo From 9776dcd1d9e759ec291c855c0e1e128f846598f6 Mon Sep 17 00:00:00 2001 From: "vimartin@redhat.com" Date: Mon, 19 Aug 2024 12:40:24 +0200 Subject: [PATCH 3/3] Update action to run on Ubuntu 22.04 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a82c84..d0142ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ on: [push, pull_request] jobs: unit-tests: name: Unit tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v2