Merge pull request #2073 from fontivan/sskeard/replace-gimme-tool

infra: CNF-14990: Replace abandoned gimme tool & Provide alignment for golang version

go.mod

@@ -1,6 +1,12 @@
 module github.com/openshift-kni/cnf-features-deploy
 
-go 1.20
+// This go version is the highest level source of truth in this project.
+// This should be matching the current branches OCP release golang version.
+// This should also be matched within this project at:
+//   - cnf-tests/Dockerfile*
+//   - openshift-ci/Dockerfile*
+//   - ztp/tools/pgt2acmpg/go.mod
+go 1.22
 
 require (
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
@@ -13,7 +19,7 @@ require (
 	github.com/k8snetworkplumbingwg/multi-networkpolicy v0.0.0-20220908143610-19b7d2ba63f9
 	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
 	github.com/k8snetworkplumbingwg/sriov-network-operator v0.0.0-00010101000000-000000000000
-	github.com/lack/mcmaker v0.0.6
+	github.com/lack/mcmaker v0.0.7
 	github.com/lack/yamltrim v0.0.1
 	github.com/nmstate/kubernetes-nmstate/api v0.0.0-00010101000000-000000000000
 	github.com/onsi/ginkgo/v2 v2.15.0

openshift-ci/Dockerfile.tools

@@ -1,10 +1,12 @@
-FROM quay.io/fedora/fedora:37-x86_64
+# The fedora version used should provide the golang version that matches $GOVERSION
+FROM quay.io/fedora/fedora:40-x86_64
 
 ENV GOPATH /go
 ENV GOBIN /go/bin
 ENV GOCACHE /go/.cache
-ENV GOVERSION=1.22.4
-ENV PATH=$PATH:/root/.gimme/versions/go"$GOVERSION".linux.amd64/bin:$GOBIN
+# This should match the version in go.mod
+ENV GOVERSION=1.22
+ENV PATH=$PATH:$GOBIN
 ARG GO_PACKAGE_PATH=github.com/openshift-kni/cnf-features-deploy
 
 # rpms required for building and running test suites
@@ -17,20 +19,18 @@ RUN dnf -y install \
     skopeo \
     findutils \
     gcc \
+    golang \
     python2 \
     diffutils \
     && dnf clean all
 
 RUN mkdir ~/bin && \
-    # install Go using gimme
-    curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme && \
-    chmod +x /usr/local/bin/gimme && \
-    eval "$(gimme $GOVERSION)" && \
-    cat $GIMME_ENV >> $HOME/.bashrc && \
+    # Print go version installed from fedora package
+    go version && \
     # get required golang tools and OC client
     go install github.com/onsi/ginkgo/v2/[email protected] && \
     go install golang.org/x/lint/golint@latest && \
-    go install github.com/lack/[email protected].6 && \
+    go install github.com/lack/[email protected].7 && \
     export latest_oc_client_version=$(curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/ 2>/dev/null | grep -o \"openshift-client-linux-4.*tar.gz\" | tr -d \") && \
     curl -JL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/${latest_oc_client_version} -o oc.tar.gz && \
     tar -xzvf oc.tar.gz && \

vendor/modules.txt

@@ -255,8 +255,8 @@ github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/namespaces
 github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/network
 github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/nodes
 github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/pod
-# github.com/lack/mcmaker v0.0.6
-## explicit; go 1.16
+# github.com/lack/mcmaker v0.0.7
+## explicit; go 1.19
 github.com/lack/mcmaker
 github.com/lack/mcmaker/pkg
 # github.com/lack/yamltrim v0.0.1

ztp/tools/pgt2acmpg/go.mod

@@ -1,6 +1,7 @@
 module github.com/openshift-kni/cnf-features-deploy/ztp/tools/pgt2acmpg
 
-go 1.20
+// this should match the version in the parent go.mod
+go 1.22
 
 // Pinned to kubernetes-1.27.4
 replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.4