From bab11fba86ad0c21cb35e12b56bf086a3332f1d2 Mon Sep 17 00:00:00 2001
From: Victoria Martinez de la Cruz <victoria@redhat.com>
Date: Wed, 5 Feb 2025 17:04:04 -0300
Subject: [PATCH] Update base image to RH UBI 9 (#44)

Migrate to RHEL9

- Use ubi9 as base image and include OpenStack repos

- Also updates the Dockerfile to be more descriptive
(use SGBRIDGE_DIR instead of D)

- Update action to run on Ubuntu 22.04

- Update DoozyX/clang-format-lint-action version
---
 .github/workflows/linter.yml |  2 +-
 .github/workflows/tests.yml  |  2 +-
 build/Dockerfile             | 10 +++++-----
 build/repos/opstools.repo    | 22 ++++++----------------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index e620e4c..a79d0e8 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4.1.3
       - name: Run clang-format-lint
-        uses: DoozyX/clang-format-lint-action@v0.11
+        uses: DoozyX/clang-format-lint-action@v0.18.2
         with:
           source: '.'
           exclude: './build'
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
diff --git a/build/Dockerfile b/build/Dockerfile
index 0cab30b..8ac64ed 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
@@ -11,16 +11,16 @@ 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/
 
 # --- 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..dc2f519 100644
--- a/build/repos/opstools.repo
+++ b/build/repos/opstools.repo
@@ -1,19 +1,9 @@
-# CentOS-OpsTools.repo
+# CentOS 9 Opstools repos
 #
-# Please see http://wiki.centos.org/SpecialInterestGroup/OpsTools for more
-# information
 
-[centos-opstools-testing]
-name=CentOS-OpsTools - testing repo
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/opstools/$basearch/collectd-5/
-gpgcheck=0
-enabled=0
-
-[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