Skip to content

Commit

Permalink
Update golang version in CI/integration scripts
Browse files Browse the repository at this point in the history
Add z version when retrieving golang binaries
  • Loading branch information
vkmc committed Aug 19, 2024
1 parent d50738a commit d2cc4ba
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
9 changes: 4 additions & 5 deletions ci/integration/metrics/ceilometer/tcp/run_sg.sh
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
#!/bin/env bash
# CI script for UBI8 job
# CI script for UBI9 job
# purpose: spawn sg-core to process messages sent by rsyslog

set -ex

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

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

export GOBIN=$GOPATH/bin
export PATH=$PATH:$GOBIN

go install golang.org/dl/go1.22@latest
go1.22 download
go install golang.org/dl/go1.22.0@latest
go1.22.0 download

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

./sg-core -config ./ci/integration/metrics/ceilometer/tcp/sg_config.yaml
9 changes: 4 additions & 5 deletions ci/integration/metrics/collectd/run_sg.sh
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
#!/bin/env bash
# CI script for UBI8 job
# CI script for UBI9 job
# purpose: spawn sg-core to process messages sent by rsyslog

set -ex

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

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

export GOBIN=$GOPATH/bin
export PATH=$PATH:$GOBIN

go install golang.org/dl/go1.22@latest
go1.22 download
go install golang.org/dl/go1.22.0@latest
go1.22.0 download

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

./sg-core -config ./ci/integration/metrics/collectd/sg_config.yaml
3 changes: 1 addition & 2 deletions ci/integration/metrics/run_bridge.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/env bash
# CI script for UBI8 job
# CI script for UBI9 job
# purpose: spawn sg-bridge for message bus connection

set -ex
Expand All @@ -8,7 +8,6 @@ CHANNEL=$QDR_CHANNEL

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

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

Expand Down
1 change: 0 additions & 1 deletion ci/unit/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set -ex

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

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

0 comments on commit d2cc4ba

Please sign in to comment.