Skip to content

Commit 9220851

Browse files
vkmcvkmc
committed
STF 1.5.7 release ops
- Pin Ceilometer to stable/2024.2 - Bump gopkg.in/yaml.v3 from 3.0.0 to 3.0.1 - Protect the expiryProc list with a mutex - Fix long message handling with dynamic buffer growth - Update to Golang 1.24.11 - Update coveralls-badge workflow to be non-blocking
2 parents 12cd068 + b391e38 commit 9220851

15 files changed

Lines changed: 466 additions & 173 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/setup-go@v5
2424
with:
25-
go-version: '1.21.13'
25+
go-version: '1.24.11'
2626
- uses: actions/checkout@v4.1.3
2727
#- name: download libraries
2828
# run: go mod download
@@ -32,7 +32,7 @@ jobs:
3232
# Caching conflicts happen in GHA, so just disable for now
3333
skip-cache: true
3434
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
35-
version: v1.59.1
35+
version: v1.64.2
3636
unit-tests:
3737
name: Unit tests
3838
runs-on: ubuntu-latest
@@ -77,7 +77,7 @@ jobs:
7777
- uses: actions/checkout@v4.1.3
7878
- uses: actions/setup-go@v5
7979
with:
80-
go-version: '1.21.13'
80+
go-version: '1.24.11'
8181
- name: Verify image builds
8282
run: |
8383
docker build --tag infrawatch/sg-core:latest --file build/Dockerfile .

‎.github/workflows/updates.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,31 @@ jobs:
1717
# (github.event.issue.author_association == 'MEMBER')
1818
# )
1919
runs-on: ubuntu-latest
20+
permissions:
21+
pull-requests: write
22+
issues: write
2023
steps:
2124
- name: update PR with coveralls badge
2225
uses: actions/github-script@v7.0.1
26+
continue-on-error: true
2327
with:
2428
github-token: ${{ secrets.GITHUB_TOKEN }}
2529
script: |
26-
var BRANCH_NAME = process.env.BRANCH_NAME;
27-
github.rest.issues.createComment({
28-
issue_number: context.issue.number,
29-
owner: context.repo.owner,
30-
repo: context.repo.repo,
31-
body: `[![Coverage Status](https://coveralls.io/repos/github/${context.repo.owner}/${context.repo.repo}/badge.svg?branch=${BRANCH_NAME})](https://coveralls.io/github/${context.repo.owner}/${context.repo.repo}?branch=${BRANCH_NAME})`
32-
})
30+
const branchName = process.env.BRANCH_NAME;
31+
if (!branchName) {
32+
console.log("No branch name found, skipping badge update.");
33+
return;
34+
}
35+
36+
try {
37+
await github.rest.issues.createComment({
38+
issue_number: context.issue.number,
39+
owner: context.repo.owner,
40+
repo: context.repo.repo,
41+
body: `[![Coverage Status](https://coveralls.io/repos/github/${context.repo.owner}/${context.repo.repo}/badge.svg?branch=${branchName})](https://coveralls.io/github/${context.repo.owner}/${context.repo.repo}?branch=${branchName})`
42+
});
43+
} catch (error) {
44+
console.log("Could not post comment: ", error.message);
45+
}
3346
env:
3447
BRANCH_NAME: ${{ github.event.pull_request.head.ref }}

‎.golangci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ linters:
3737
- dupl
3838
- errcheck
3939
# - exhaustive
40-
- exportloopref
40+
- copyloopvar
4141
# - gochecknoinits
4242
- goconst
4343
- gocritic
@@ -61,5 +61,5 @@ linters:
6161
- unconvert
6262
# NOTE: not all application plugins use ability to emit internal events through
6363
# passed bus function in it's constructor.
64-
#- unparam
64+
# - unparam
6565
# - whitespace

‎build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY . $D/
1010
COPY build/repos/opstools.repo /etc/yum.repos.d/CentOS-OpsTools.repo
1111

1212
RUN dnf install golang git qpid-proton-c-devel -y --setopt=tsflags=nodocs
13-
RUN go install golang.org/dl/go1.21.13@latest && /go/bin/go1.21.13 download && PRODUCTION_BUILD=false CONTAINER_BUILD=true GOCMD=/go/bin/go1.21.13 ./build.sh
13+
RUN go install golang.org/dl/go1.24.11@latest && /go/bin/go1.24.11 download && PRODUCTION_BUILD=false CONTAINER_BUILD=true GOCMD=/go/bin/go1.24.11 ./build.sh
1414

1515
# --- end build, create smart gateway layer ---
1616
FROM registry.access.redhat.com/ubi9-minimal:latest

‎ci/integration/logging/run_sg.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
1212
export GOBIN=$GOPATH/bin
1313
export PATH=$PATH:$GOBIN
1414

15-
go install golang.org/dl/go1.21.13@latest
16-
go1.21.13 download
15+
go install golang.org/dl/go1.24.11@latest
16+
go1.24.11 download
1717

1818
# install sg-core and start sg-core
1919
mkdir -p /usr/lib64/sg-core
20-
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
20+
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
2121

2222
./sg-core -config ./ci/integration/logging/sg_config.yaml

‎ci/integration/metrics/ceilometer/bridge/run_sg.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
1212
export GOBIN=$GOPATH/bin
1313
export PATH=$PATH:$GOBIN
1414

15-
go install golang.org/dl/go1.21.13@latest
16-
go1.21.13 download
15+
go install golang.org/dl/go1.24.11@latest
16+
go1.24.11 download
1717

1818
# install sg-core and start sg-core
1919
mkdir -p /usr/lib64/sg-core
20-
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
20+
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
2121

2222
./sg-core -config ./ci/integration/metrics/ceilometer/bridge/sg_config.yaml

‎ci/integration/metrics/ceilometer/tcp/run_sg.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
1313
export GOBIN=$GOPATH/bin
1414
export PATH=$PATH:$GOBIN
1515

16-
go install golang.org/dl/go1.21.13@latest
17-
go1.21.13 download
16+
go install golang.org/dl/go1.24.11@latest
17+
go1.24.11 download
1818

1919
# install sg-core and start sg-core
2020
mkdir -p /usr/lib64/sg-core
21-
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
21+
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
2222

2323
./sg-core -config ./ci/integration/metrics/ceilometer/tcp/sg_config.yaml

‎ci/integration/metrics/collectd/run_sg.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ dnf install -y git golang gcc make qpid-proton-c-devel
1212
export GOBIN=$GOPATH/bin
1313
export PATH=$PATH:$GOBIN
1414

15-
go install golang.org/dl/go1.21.13@latest
16-
go1.21.13 download
15+
go install golang.org/dl/go1.24.11@latest
16+
go1.24.11 download
1717

1818
# install sg-core and start sg-core
1919
mkdir -p /usr/lib64/sg-core
20-
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.21.13 BUILD_ARGS=-buildvcs=false ./build.sh
20+
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.24.11 BUILD_ARGS=-buildvcs=false ./build.sh
2121

2222
./sg-core -config ./ci/integration/metrics/collectd/sg_config.yaml

‎ci/integration/metrics/local.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RABBIT_PASSWORD=$ADMIN_PASSWORD
66
SERVICE_PASSWORD=$ADMIN_PASSWORD
77
REDIS_PASSWORD=$ADMIN_PASSWORD
88

9-
enable_plugin ceilometer https://opendev.org/openstack/ceilometer.git
9+
enable_plugin ceilometer https://opendev.org/openstack/ceilometer.git stable/2024.2
1010
CEILOMETER_BACKEND=none
1111
CEILOMETER_PIPELINE_INTERVAL=60
1212
enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification

‎ci/unit/run_tests.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ yum install -y git golang gcc make glibc-langpack-en qpid-proton-c-devel
1313
export GOBIN=$GOPATH/bin
1414
export PATH=$PATH:$GOBIN
1515

16-
go install golang.org/dl/go1.21.13@latest
17-
go1.21.13 download
16+
go install golang.org/dl/go1.24.11@latest
17+
go1.24.11 download
1818

1919

20-
go1.21.13 test -v -coverprofile=profile.cov ./...
20+
go1.24.11 test -v -coverprofile=profile.cov ./...

0 commit comments

Comments
 (0)