Pipeline for LTS Channel and go_1_22.4

Signed-off-by: daveaugustus <pappu.kumar@progress.com>
chef · Sep 18, 2024 · 87c6fe6 · 87c6fe6
1 parent fcf8915
commit 87c6fe6
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 deletions.
diff --git a/.expeditor/generate-automate-cli-docs.sh b/.expeditor/generate-automate-cli-docs.sh
@@ -2,7 +2,7 @@
 set -eou pipefail
 
 # bumping expeditor to go 1.22
-hab pkg install --binlink core/go22 --force
+hab pkg install --binlink core/go1_22/1.22.4 --force
 
 pushd components/automate-cli
   make docs

diff --git a/.expeditor/license_scout.sh b/.expeditor/license_scout.sh
@@ -43,7 +43,7 @@ gem install license_scout -v 2.5.1
 log "Finished Installing License Scout"
 
 log_section_start "Installing Go 1.22.5"
-hab pkg install --force --binlink core/go22/1.22.5 && rm -rf /hab/cache && mkdir -p "$GOPATH/src" "$GOPATH/bin"
+hab pkg install --force --binlink core/go1_22/1.22.4 && rm -rf /hab/cache && mkdir -p "$GOPATH/src" "$GOPATH/bin"
 go version
 log "Finished Installing Go 1.22.5"
 

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -1,7 +1,7 @@
 env:
   DOCKER_CONFIG: /var/lib/buildkite-agent/.docker
-  HAB_BLDR_CHANNEL: "stable"
-  HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
+  HAB_BLDR_CHANNEL: "LTS-2024"
+  HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
   # Use the Go module mirror and checksum database by default.
   # See https://proxy.golang.org for details.
   GOPROXY: "https://proxy.golang.org,direct"

diff --git a/.expeditor/verify_private.pipeline.yml b/.expeditor/verify_private.pipeline.yml
@@ -4,10 +4,10 @@
 
 env:
   DOCKER_CONFIG: /var/lib/buildkite-agent/.docker
-  HAB_BLDR_CHANNEL: "stable"
+  HAB_BLDR_CHANNEL: "LTS-2024"
   #HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: "curl8"
   #HAB_FALLBACK_CHANNEL: "stable"
-  HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
+  HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
   GOPROXY: "https://proxy.golang.org,direct"
   GOSUMDB: "sum.golang.org"
   PGGSSENCMODE: "disable"

diff --git a/.studio/common b/.studio/common
@@ -98,7 +98,7 @@ function link_component_bin() {
 }
 
 function desired_golang_ident() {
-    echo "core/go22/$(cat /src/GOLANG_VERSION)"
+    echo "core/go1_22/1.22.4/$(cat /src/GOLANG_VERSION)"
 }
 
 function verify_components_have_platform_config() {
@@ -209,6 +209,8 @@ function build() {
     hab_build=/bin/build
   fi
 
+  echo "Building from channel: $HAB_BLDR_CHANNEL"
+
   # Support prior hab versions
   if [ -f /hab/bin/build ]; then
     hab_build=/hab/bin/build

diff --git a/.studio/compliance-service b/.studio/compliance-service
@@ -146,7 +146,7 @@ function load_scan_jobs() {
     # shellcheck disable=SC1091
     source dev/secrets-env.sh
     pushd dev-docs/adding-data &> /dev/null
-    iinstall_if_missing core/go22 go
+    iinstall_if_missing core/go1_22/1.22.4 go
     go run add_scanjobs.go
     popd &> /dev/null
   fi

diff --git a/components/automate-dex/habitat/plan.sh b/components/automate-dex/habitat/plan.sh
@@ -28,7 +28,7 @@ pkg_deps=(
   core/curl # health_check hook
 )
 
-pkg_build_deps=(core/go22 core/git core/gcc)
+pkg_build_deps=(core/go1_22/1.22.4 core/git core/gcc)
 
 pkg_scaffolding="${local_scaffolding_origin:-chef}/automate-scaffolding"
 

diff --git a/components/automate-scaffolding-go/habitat/plan.sh b/components/automate-scaffolding-go/habitat/plan.sh
@@ -11,7 +11,7 @@ pkg_version="0.1.0"
 pkg_license=('Chef-MLSA')
 pkg_source=nosuchfile.tar.gz
 pkg_deps=(
- core/go22/1.22.5/20240712112719 # This is only pinned to force a scaffolding rebuild to this version
+ core/go1_22/1.22.4 # This is only pinned to force a scaffolding rebuild to this version
  core/git
 
 )

diff --git a/components/backup-gateway/habitat/plan.sh b/components/backup-gateway/habitat/plan.sh
@@ -6,7 +6,7 @@ pkg_version="0.1.0"
 pkg_origin=chef
 pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=('Apache-2.0')
-pkg_build_deps=(core/go22 core/git core/gcc)
+pkg_build_deps=(core/go1_22/1.22.4 core/git core/gcc)
 pkg_bin_dirs=(bin)
 
 pkg_deps=(

diff --git a/scripts/install_golang.sh b/scripts/install_golang.sh
@@ -15,7 +15,7 @@ desired_golang_version() {
 
 install_hab_go() {
     local ident
-    ident="core/go22/$(desired_golang_version)"
+    ident="core/go1_22/1.22.4/$(desired_golang_version)"
     hab pkg install "$ident"
     hab pkg binlink "$ident" go --force
     hab pkg binlink "$ident" gofmt --force

diff --git a/scripts/repo_health.sh b/scripts/repo_health.sh
@@ -12,7 +12,7 @@ export GOPROXY="https://proxy.golang.org,direct"
 export GOSUMDB="sum.golang.org"
 
 hab pkg install -b core/git core/ruby core/jq-static core/shellcheck core/cacerts
-hab pkg install -b "core/go22/$(desired_golang_version)"
+hab pkg install -b "core/go1_22/1.22.4/$(desired_golang_version)"
 
 echo "Checking Go Dependencies And Vendored Protos"
 go mod verify