Skip to content

Commit d2cc4ba

Browse files
committed
Update golang version in CI/integration scripts
Add z version when retrieving golang binaries
1 parent d50738a commit d2cc4ba

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
#!/bin/env bash
2-
# CI script for UBI8 job
2+
# CI script for UBI9 job
33
# purpose: spawn sg-core to process messages sent by rsyslog
44

55
set -ex
66

77
# enable required repo(s)
88
curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
9-
sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo
109

1110
dnf install -y git golang gcc make qpid-proton-c-devel
1211

1312
export GOBIN=$GOPATH/bin
1413
export PATH=$PATH:$GOBIN
1514

16-
go install golang.org/dl/go1.22@latest
17-
go1.22 download
15+
go install golang.org/dl/go1.22.0@latest
16+
go1.22.0 download
1817

1918
# install sg-core and start sg-core
2019
mkdir -p /usr/lib64/sg-core
21-
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.22 BUILD_ARGS=-buildvcs=false ./build.sh
20+
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.22.0 BUILD_ARGS=-buildvcs=false ./build.sh
2221

2322
./sg-core -config ./ci/integration/metrics/ceilometer/tcp/sg_config.yaml
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
#!/bin/env bash
2-
# CI script for UBI8 job
2+
# CI script for UBI9 job
33
# purpose: spawn sg-core to process messages sent by rsyslog
44

55
set -ex
66

77
# enable required repo(s)
88
curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
9-
sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo
109

1110
dnf install -y git golang gcc make qpid-proton-c-devel
1211

1312
export GOBIN=$GOPATH/bin
1413
export PATH=$PATH:$GOBIN
1514

16-
go install golang.org/dl/go1.22@latest
17-
go1.22 download
15+
go install golang.org/dl/go1.22.0@latest
16+
go1.22.0 download
1817

1918
# install sg-core and start sg-core
2019
mkdir -p /usr/lib64/sg-core
21-
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.22 BUILD_ARGS=-buildvcs=false ./build.sh
20+
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.22.0 BUILD_ARGS=-buildvcs=false ./build.sh
2221

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

ci/integration/metrics/run_bridge.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/env bash
2-
# CI script for UBI8 job
2+
# CI script for UBI9 job
33
# purpose: spawn sg-bridge for message bus connection
44

55
set -ex
@@ -8,7 +8,6 @@ CHANNEL=$QDR_CHANNEL
88

99
# enable required repo(s)
1010
curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
11-
sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo
1211

1312
dnf install -y git gcc make qpid-proton-c-devel redhat-rpm-config
1413

ci/unit/run_tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ set -ex
66

77
# enable required repo(s)
88
curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
9-
sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo
109

1110
# without glibc-langpack-en locale setting in CentOS8 is broken without this package
1211
yum install -y git golang gcc make glibc-langpack-en qpid-proton-c-devel

0 commit comments

Comments
 (0)