Skip to content

Commit 221287f

Browse files
committed
STF 1.5.6 release ops
2 parents 1029feb + bab11fb commit 221287f

File tree

4 files changed

+13
-23
lines changed

4 files changed

+13
-23
lines changed

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Checkout code
1212
uses: actions/checkout@v4.1.3
1313
- name: Run clang-format-lint
14-
uses: DoozyX/clang-format-lint-action@v0.11
14+
uses: DoozyX/clang-format-lint-action@v0.18.2
1515
with:
1616
source: '.'
1717
exclude: './build'

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on: [push, pull_request]
99
jobs:
1010
unit-tests:
1111
name: Unit tests
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Checkout code
1515
uses: actions/checkout@v2

build/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# --- Build the bridge
2-
FROM registry.access.redhat.com/ubi8 AS builder
2+
FROM registry.access.redhat.com/ubi9 AS builder
33

44
# dependencies for qpid-proton-c
55
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 && \
1111
dnf install gcc make redhat-rpm-config -y && \
1212
dnf clean all
1313

14-
ENV D=/home/bridge
14+
ENV SGBRIDGE_DIR=/home/bridge
1515

16-
WORKDIR $D
17-
COPY . $D/
16+
WORKDIR $SGBRIDGE_DIR
17+
COPY . $SGBRIDGE_DIR/
1818

1919
RUN make && \
2020
mv bridge /tmp/
2121

2222
# --- end build, create bridge runtime layer ---
23-
FROM registry.access.redhat.com/ubi8
23+
FROM registry.access.redhat.com/ubi9
2424

2525
# dependencies for qpid-proton-c
2626
COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo

build/repos/opstools.repo

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
1-
# CentOS-OpsTools.repo
1+
# CentOS 9 Opstools repos
22
#
3-
# Please see http://wiki.centos.org/SpecialInterestGroup/OpsTools for more
4-
# information
53

6-
[centos-opstools-testing]
7-
name=CentOS-OpsTools - testing repo
8-
baseurl=https://buildlogs.centos.org/centos/$releasever-stream/opstools/$basearch/collectd-5/
9-
gpgcheck=0
10-
enabled=0
11-
12-
[centos-opstools]
13-
name=CentOS-OpsTools - collectd
14-
#mirrorlist=http://mirrorlist.centos.org/?arch=$basearch&release=$releasever-stream&repo=opstools-collectd-5
15-
baseurl=http://vault.centos.org/$releasever-stream/opstools/$basearch/collectd-5/
16-
gpgcheck=0
4+
[centos9-opstools]
5+
name=centos9-opstools
6+
baseurl=http://mirror.stream.centos.org/SIGs/9-stream/opstools/$basearch/collectd-5/
177
enabled=1
18-
skip_if_unavailable=1
19-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools
8+
gpgcheck=0
9+
module_hotfixes=1

0 commit comments

Comments
 (0)