From d2cc4ba7a420b31f7c81a690630ad1c25faaaf13 Mon Sep 17 00:00:00 2001 From: "vimartin@redhat.com" Date: Mon, 19 Aug 2024 10:39:07 +0200 Subject: [PATCH] Update golang version in CI/integration scripts Add z version when retrieving golang binaries --- ci/integration/metrics/ceilometer/tcp/run_sg.sh | 9 ++++----- ci/integration/metrics/collectd/run_sg.sh | 9 ++++----- ci/integration/metrics/run_bridge.sh | 3 +-- ci/unit/run_tests.sh | 1 - 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ci/integration/metrics/ceilometer/tcp/run_sg.sh b/ci/integration/metrics/ceilometer/tcp/run_sg.sh index 637b951c..6964f5b4 100644 --- a/ci/integration/metrics/ceilometer/tcp/run_sg.sh +++ b/ci/integration/metrics/ceilometer/tcp/run_sg.sh @@ -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 diff --git a/ci/integration/metrics/collectd/run_sg.sh b/ci/integration/metrics/collectd/run_sg.sh index 04bb476e..7a9c8e4e 100644 --- a/ci/integration/metrics/collectd/run_sg.sh +++ b/ci/integration/metrics/collectd/run_sg.sh @@ -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 diff --git a/ci/integration/metrics/run_bridge.sh b/ci/integration/metrics/run_bridge.sh index f28c2dea..99fef65f 100644 --- a/ci/integration/metrics/run_bridge.sh +++ b/ci/integration/metrics/run_bridge.sh @@ -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 @@ -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 diff --git a/ci/unit/run_tests.sh b/ci/unit/run_tests.sh index 2193bc5f..48b9937f 100644 --- a/ci/unit/run_tests.sh +++ b/ci/unit/run_tests.sh @@ -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