From afc84f92bd11f61f824bbf6f29eab60bde16380b Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Wed, 9 Oct 2024 14:22:26 -0500 Subject: [PATCH] Provide an override on the go version for eks snaps --- jobs/build-snaps.yaml | 6 ++++++ jobs/build-snaps/build-release-eks-snaps.groovy | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/jobs/build-snaps.yaml b/jobs/build-snaps.yaml index 31ba79faf..274aa11c6 100644 --- a/jobs/build-snaps.yaml +++ b/jobs/build-snaps.yaml @@ -76,6 +76,12 @@ default: '' description: | Snap base to use as an override while building snaps + - string: + name: eks_go_override + default: '' + description: | + Snap go version to use as an override while building snaps + MUST be in format 'go/\d+\.\d+/stable' - string: name: k8s_tag default: 'v{version}' diff --git a/jobs/build-snaps/build-release-eks-snaps.groovy b/jobs/build-snaps/build-release-eks-snaps.groovy index 53d91169f..931abc5f5 100644 --- a/jobs/build-snaps/build-release-eks-snaps.groovy +++ b/jobs/build-snaps/build-release-eks-snaps.groovy @@ -14,6 +14,7 @@ def _find_eks_base(version, override){ } def eks_base_override = params.eks_base_override def EKS_BASE = _find_eks_base(kube_version, eks_base_override) +def GO_VERSION = params.eks_go_override pipeline { agent { @@ -68,6 +69,11 @@ pipeline { -e "s/^base: .*/base: ${EKS_BASE}/" \ -e "s/install-mode: .*/install-mode: disable/" snapcraft.yaml + # update the go version if overriden + if [ -n "${GO_VERSION}" ]; then + sed -i -e "s#go/.*#${GO_VERSION}#g" snapcraft.yaml + fi + # if we don't have any base defined at this point, add one grep -q "^base: " snapcraft.yaml || echo "base: ${EKS_BASE}" >> snapcraft.yaml