Merge pull request #1919 from habitat-sh/jah/pipeline-check

Fixes verify pipeline and a bit of hygeine

Author: jasonheath

.buildkite/hooks/pre-command

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ $BUILDKITE_ORGANIZATION_SLUG = 'chef-canary' ]]; then
+  AWS_REGION='us-west-1'
+elif [[ $BUILDKITE_ORGANIZATION_SLUG = 'chef' ]] || [[ $BUILDKITE_ORGANIZATION_SLUG = 'chef-oss' ]]; then
+  AWS_REGION='us-west-2'
+fi
+
+HAB_AUTH_TOKEN=$(aws ssm get-parameter --name 'habitat-prod-auth-token' --with-decryption --query Parameter.Value --output text --region "${AWS_REGION}")
+export HAB_AUTH_TOKEN

.expeditor/builder_seed.toml

@@ -5,9 +5,9 @@ file_descriptor = "Packages needed to run an instance of Builder"
 channel = "stable"
 packages = [
   # Supervisor and prerequisites
-  "core/hab-launcher",
-  "core/hab",
-  "core/hab-sup",
+  "chef/hab-launcher",
+  "chef/hab",
+  "chef/hab-sup",
 ]
 
 [[x86_64-linux]]

.expeditor/scripts/verify/builder-api-functional.sh

@@ -2,22 +2,32 @@
 
 set -euo pipefail
 
+readonly channel='acceptance'
+
 # 10/11/2024: We need to use the most recent hab binary that is not yet in stable
 # to build against LTS without conflicts with existing stable packages
-hab pkg install core/hab --channel acceptance -bf
+hab pkg install chef/hab --channel="${channel}" --binlink --force
+
+# 2025-07-16: Installing these works around a bug that exists at the
+# current time where the HAB_AUTH_TOKEN isn't read  when packages are
+# automatically installed by calls to different hab commands.
+# See https://progresssoftware.atlassian.net/browse/CHEF-23525
+hab pkg install chef/hab-studio --channel="${channel}" --binlink --force
+hab pkg install chef/hab-sup --channel="${channel}" --binlink --force
+hab pkg install chef/hab-launcher --channel="${channel}" --binlink --force
 
 echo "--- Generating signing key"
 hab origin key generate "$HAB_ORIGIN"
 
-echo "--- Updating .studiorc" 
-cat .expeditor/templates/studiorc >> .studiorc
+echo "--- Updating .studiorc"
+cat .expeditor/templates/studiorc >>.studiorc
 
 echo "--- Copying habitat-env"
 cp .secrets/habitat-env.sample .secrets/habitat-env
 
 echo "--- Entering studio"
 env HAB_NONINTERACTIVE=true \
     HAB_STUDIO_SUP=false \
-    HAB_INTERNAL_BLDR_CHANNEL=acceptance \
-    HAB_STUDIO_SECRET_HAB_INTERNAL_BLDR_CHANNEL=acceptance \
+    HAB_INTERNAL_BLDR_CHANNEL="${channel}" \
+    HAB_STUDIO_SECRET_HAB_INTERNAL_BLDR_CHANNEL="${channel}" \
     hab studio enter

.expeditor/templates/studiorc

@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+# This file (.expeditor/templates/studiorc) is concatenated onto .studiorc when
+# .expeditor/scripts/verify/builder-api-functional.sh runs.  
+
 cd /src || exit
 
 echo "--- Installing prerequisites"

.expeditor/verify.pipeline.yml

@@ -3,18 +3,14 @@ expeditor:
     buildkite:
       timeout_in_minutes: 30
       env:
-          HAB_BLDR_CHANNEL: LTS-2024
-          HAB_REFRESH_CHANNEL: LTS-2024
-          HAB_FALLBACK_CHANNEL: LTS-2024
-          HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: LTS-2024
-          HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: LTS-2024
-          HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: LTS-2024
+        HAB_BLDR_CHANNEL: LTS-2024
+        HAB_REFRESH_CHANNEL: LTS-2024
+        HAB_FALLBACK_CHANNEL: LTS-2024
+        HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: LTS-2024
+        HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: LTS-2024
+        HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: LTS-2024
 
 steps:
-#######################################################################
-# Linting!
-#######################################################################
-
   - label: "[lint] :linux: :bash: Shellcheck"
     command:
       - ./test/shellcheck.sh
@@ -53,10 +49,6 @@ steps:
       executor:
         docker:
 
-#######################################################################
-# Unit Tests - Linux!
-#######################################################################
-
   - label: "[unit] :linux: builder-api"
     command:
       - ./test/run_cargo_test.sh builder-api
@@ -125,6 +117,7 @@ steps:
         docker:
           privileged: true
           environment:
+            - HAB_AUTH_TOKEN
             - HAB_ORIGIN=habitat
             - HAB_STUDIO_SECRET_NODE_OPTIONS="--dns-result-order=ipv4first"
 
@@ -141,7 +134,4 @@ steps:
           privileged: true
           environment:
             - HAB_ORIGIN=habitat
-            # The following variables are only set inside `studio` and how we enter
-            # `studio` should not matter.
-            # test test
             - HAB_STUDIO_SECRET_NODE_OPTIONS="--dns-result-order=ipv4first"