Skip to content

Commit fb84f57

Browse files
committed
use base-2025 instead of LTS-2024 and use HAB_AUTH_TOKEN in all pipelines
Signed-off-by: Matt Wrock <matt@mattwrock.com>
1 parent 4f46660 commit fb84f57

18 files changed

Lines changed: 636 additions & 690 deletions

File tree

.expeditor/end_to_end.pipeline.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
expeditor:
22
secrets:
3-
PIPELINE_HAB_AUTH_TOKEN:
3+
HAB_AUTH_TOKEN:
44
path: account/static/habitat/chef-ci
55
field: auth_token # Production Builder
66
accounts:
@@ -45,7 +45,7 @@ steps:
4545
- label: "[:linux: hup-does-not-abandon-services]"
4646
command:
4747
- .expeditor/scripts/end_to_end/setup_environment.sh dev
48-
- hab pkg install --binlink --channel=LTS-2024 core/expect
48+
- hab pkg install --binlink --channel=base-2025 core/expect
4949
- hab pkg install --channel=\$HAB_BLDR_CHANNEL core/hab-sup core/hab-launcher
5050
- test/end-to-end/hup-does-not-abandon-services.exp
5151
expeditor:
@@ -708,7 +708,7 @@ steps:
708708
docker:
709709
privileged: true
710710
environment:
711-
- PIPELINE_HAB_AUTH_TOKEN
711+
- HAB_AUTH_TOKEN
712712
- PIPELINE_HAB_BLDR_URL=https://bldr.habitat.sh
713713
- BUILD_PKG_TARGET=x86_64-linux
714714

@@ -887,7 +887,7 @@ steps:
887887
privileged: true
888888
environment:
889889
- BUILD_PKG_TARGET=x86_64-linux
890-
- PIPELINE_HAB_AUTH_TOKEN
890+
- HAB_AUTH_TOKEN
891891

892892
- label: "[:windows: test_svc_update]"
893893
command:
@@ -903,7 +903,7 @@ steps:
903903
environment:
904904
- BUILD_PKG_TARGET=x86_64-windows
905905
- BUILDKITE_AGENT_ACCESS_TOKEN
906-
- PIPELINE_HAB_AUTH_TOKEN
906+
- HAB_AUTH_TOKEN
907907
retry:
908908
automatic:
909909
limit: 1
@@ -921,7 +921,7 @@ steps:
921921
privileged: true
922922
environment:
923923
- BUILD_PKG_TARGET=x86_64-linux
924-
- PIPELINE_HAB_AUTH_TOKEN
924+
- HAB_AUTH_TOKEN
925925

926926
- label: "[:windows: test_config_files]"
927927
command:
@@ -937,7 +937,7 @@ steps:
937937
environment:
938938
- BUILD_PKG_TARGET=x86_64-windows
939939
- BUILDKITE_AGENT_ACCESS_TOKEN
940-
- PIPELINE_HAB_AUTH_TOKEN
940+
- HAB_AUTH_TOKEN
941941
retry:
942942
automatic:
943943
limit: 1
@@ -955,7 +955,7 @@ steps:
955955
privileged: true
956956
environment:
957957
- BUILD_PKG_TARGET=x86_64-linux
958-
- PIPELINE_HAB_AUTH_TOKEN
958+
- HAB_AUTH_TOKEN
959959

960960
- label: "[:windows: test_alternate_error_exit_codes]"
961961
command:
@@ -971,7 +971,7 @@ steps:
971971
environment:
972972
- BUILD_PKG_TARGET=x86_64-windows
973973
- BUILDKITE_AGENT_ACCESS_TOKEN
974-
- PIPELINE_HAB_AUTH_TOKEN
974+
- HAB_AUTH_TOKEN
975975
retry:
976976
automatic:
977977
limit: 1
@@ -1017,7 +1017,7 @@ steps:
10171017
privileged: true
10181018
environment:
10191019
- BUILD_PKG_TARGET=x86_64-linux
1020-
- PIPELINE_HAB_AUTH_TOKEN
1020+
- HAB_AUTH_TOKEN
10211021

10221022
- label: "[:windows: test_external_binaries]"
10231023
command:
@@ -1033,7 +1033,7 @@ steps:
10331033
environment:
10341034
- BUILD_PKG_TARGET=x86_64-windows
10351035
- BUILDKITE_AGENT_ACCESS_TOKEN
1036-
- PIPELINE_HAB_AUTH_TOKEN
1036+
- HAB_AUTH_TOKEN
10371037
retry:
10381038
automatic:
10391039
limit: 1
@@ -1051,7 +1051,7 @@ steps:
10511051
privileged: true
10521052
environment:
10531053
- BUILD_PKG_TARGET=x86_64-linux
1054-
- PIPELINE_HAB_AUTH_TOKEN
1054+
- HAB_AUTH_TOKEN
10551055

10561056
- label: "[:linux: test_hab_bldr_channel_list_sandbox]"
10571057
command:
@@ -1078,7 +1078,7 @@ steps:
10781078
privileged: true
10791079
environment:
10801080
- BUILD_PKG_TARGET=x86_64-linux
1081-
- PIPELINE_HAB_AUTH_TOKEN
1081+
- HAB_AUTH_TOKEN
10821082

10831083
- label: "[:linux: test_health_check_output_of_http_gateway]"
10841084
command:
@@ -1093,7 +1093,7 @@ steps:
10931093
privileged: true
10941094
environment:
10951095
- BUILD_PKG_TARGET=x86_64-linux
1096-
- PIPELINE_HAB_AUTH_TOKEN
1096+
- HAB_AUTH_TOKEN
10971097

10981098
- label: "[:windows: test_health_check_output_of_http_gateway]"
10991099
command:
@@ -1109,7 +1109,7 @@ steps:
11091109
environment:
11101110
- BUILD_PKG_TARGET=x86_64-windows
11111111
- BUILDKITE_AGENT_ACCESS_TOKEN
1112-
- PIPELINE_HAB_AUTH_TOKEN
1112+
- HAB_AUTH_TOKEN
11131113

11141114
- label: "[:linux: test_supervisor_lock_file_behavior]"
11151115
command:
@@ -1124,7 +1124,7 @@ steps:
11241124
privileged: true
11251125
environment:
11261126
- BUILD_PKG_TARGET=x86_64-linux
1127-
- PIPELINE_HAB_AUTH_TOKEN
1127+
- HAB_AUTH_TOKEN
11281128

11291129
- label: "[:windows: test_supervisor_lock_file_behavior]"
11301130
command:
@@ -1140,7 +1140,7 @@ steps:
11401140
environment:
11411141
- BUILD_PKG_TARGET=x86_64-windows
11421142
- BUILDKITE_AGENT_ACCESS_TOKEN
1143-
- PIPELINE_HAB_AUTH_TOKEN
1143+
- HAB_AUTH_TOKEN
11441144

11451145
- wait
11461146

.expeditor/release_habitat.pipeline.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
expeditor:
22
secrets:
3-
PIPELINE_HAB_AUTH_TOKEN:
3+
HAB_AUTH_TOKEN:
44
path: account/static/habitat/chef-ci
55
field: auth_token # Production Builder
66
# acceptance_auth_token = acceptance
@@ -13,9 +13,9 @@ expeditor:
1313
HAB_ORIGIN: "core"
1414
PIPELINE_HAB_BLDR_URL: "https://bldr.habitat.sh"
1515
# Necessary to prevent old studios from poisoning builds after core plans refreshes
16-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
16+
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "base-2025"
1717
HAB_STUDIO_SECRET_HAB_FEAT_IGNORE_LOCAL: "true"
18-
HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "LTS-2024"
18+
HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "base-2025"
1919

2020
steps:
2121
#######################################################################
@@ -36,7 +36,6 @@ steps:
3636
agents:
3737
queue: default-privileged-aarch64
3838
env:
39-
HAB_FALLBACK_CHANNEL: "LTS-2024"
4039
BUILD_PKG_TARGET: "aarch64-linux"
4140
command:
4241
- sudo -E .expeditor/scripts/release_habitat/build_component.sh hab
@@ -106,7 +105,6 @@ steps:
106105
agents:
107106
queue: default-privileged-aarch64
108107
env:
109-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
110108
BUILD_PKG_TARGET: "aarch64-linux"
111109
command:
112110
- sudo -E .expeditor/scripts/release_habitat/build_component.sh plan-build
@@ -138,7 +136,6 @@ steps:
138136
agents:
139137
queue: default-privileged-aarch64
140138
env:
141-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
142139
BUILD_PKG_TARGET: "aarch64-linux"
143140
command:
144141
- sudo -E .expeditor/scripts/release_habitat/build_component.sh backline
@@ -159,7 +156,6 @@ steps:
159156
agents:
160157
queue: default-privileged-aarch64
161158
env:
162-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
163159
BUILD_PKG_TARGET: "aarch64-linux"
164160
command:
165161
- sudo -E .expeditor/scripts/release_habitat/build_component.sh studio
@@ -194,7 +190,6 @@ steps:
194190
agents:
195191
queue: default-privileged-aarch64
196192
env:
197-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
198193
BUILD_PKG_TARGET: "aarch64-linux"
199194
command:
200195
- sudo -E .expeditor/scripts/release_habitat/build_component.sh launcher
@@ -224,7 +219,6 @@ steps:
224219
agents:
225220
queue: default-privileged-aarch64
226221
env:
227-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
228222
BUILD_PKG_TARGET: "aarch64-linux"
229223
command:
230224
- sudo -E .expeditor/scripts/release_habitat/build_component.sh sup
@@ -254,7 +248,6 @@ steps:
254248
agents:
255249
queue: default-privileged-aarch64
256250
env:
257-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
258251
BUILD_PKG_TARGET: "aarch64-linux"
259252
command:
260253
- sudo -E .expeditor/scripts/release_habitat/build_component.sh pkg-export-container
@@ -284,7 +277,6 @@ steps:
284277
agents:
285278
queue: default-privileged-aarch64
286279
env:
287-
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
288280
BUILD_PKG_TARGET: "aarch64-linux"
289281
command:
290282
- sudo -E .expeditor/scripts/release_habitat/build_component.sh pkg-export-tar

.expeditor/scripts/buildkite_promote.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ source_environment=${1:?You must provide an Expeditor environment}
2828
# e.g. `acceptance`, `current`, etc
2929
destination_channel=${2:?You must specify a destination channel value}
3030

31-
export HAB_AUTH_TOKEN="${PIPELINE_HAB_AUTH_TOKEN}"
32-
3331
########################################################################
3432

3533
source .expeditor/scripts/shared.sh

.expeditor/scripts/release_habitat/build_component.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if($Component.Equals("")) {
1717
}
1818

1919
# We have to do this because everything that comes from vault is quoted on windows.
20-
$Rawtoken=$Env:PIPELINE_HAB_AUTH_TOKEN
20+
$Rawtoken=$Env:HAB_AUTH_TOKEN
2121
$Env:HAB_AUTH_TOKEN=$Rawtoken.Replace("`"","")
2222

2323
$Env:buildkiteAgentToken = $Env:BUILDKITE_AGENT_ACCESS_TOKEN

.expeditor/scripts/release_habitat/build_component.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -euo pipefail
44

55
source .expeditor/scripts/release_habitat/shared.sh
66

7-
export HAB_AUTH_TOKEN="${PIPELINE_HAB_AUTH_TOKEN}"
87
export HAB_BLDR_URL="${PIPELINE_HAB_BLDR_URL}"
98

109
# Before we do *ANYTHING*, we're going to just delete any prior
Lines changed: 68 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,68 @@
1-
#!/usr/local/bin/bash
2-
3-
set -euo pipefail
4-
5-
source .expeditor/scripts/release_habitat/shared.sh
6-
7-
# Get secrets! (our auth token and aws creds should be auto-injected but there's a bug:
8-
# https://github.com/chef/ci-studio-common/issues/200)
9-
eval "$(vault-util fetch-secret-env)"
10-
11-
export HAB_AUTH_TOKEN="${PIPELINE_HAB_AUTH_TOKEN}"
12-
export HAB_BLDR_URL="${PIPELINE_HAB_BLDR_URL}"
13-
14-
15-
echo "--- Executing: brew install protobuf"
16-
brew install protobuf
17-
18-
channel=$(get_release_channel)
19-
20-
echo "--- Channel: $channel - bldr url: $HAB_BLDR_URL"
21-
22-
macos_install_bootstrap_package
23-
24-
declare -g hab_binary
25-
curlbash_hab "x86_64-darwin"
26-
import_keys
27-
28-
macos_use_cert_file_from_linux_cacerts_package
29-
30-
# the macos 11 anka image does not allow us to create a /hab
31-
# directory so we mount off /tmp
32-
export HAB_ROOT_PATH
33-
HAB_ROOT_PATH=$(mktemp -d /tmp/fs-root-XXXXXX)
34-
35-
macos_sync_cache_signing_keys
36-
37-
install_rustup
38-
39-
if [ "$BUILD_PKG_TARGET" == "aarch64-darwin" ]; then
40-
rustup target add aarch64-apple-darwin
41-
fi
42-
43-
# set the rust toolchain
44-
rust_toolchain="$(tail -n 1 rust-toolchain | cut -d'"' -f 2)"
45-
echo "--- :rust: Using Rust toolchain ${rust_toolchain}"
46-
rustc --version # just 'cause I'm paranoid and I want to double check
47-
48-
echo "--- :habicat: Building components/hab"
49-
50-
HAB_BLDR_CHANNEL="${channel}" macos_build components/hab
51-
source results/last_build.env
52-
53-
# This is a hack to rebuild the hart with corrected directory structure
54-
# changing the root from /tmp to /hab
55-
rm -f results/"$pkg_artifact"
56-
tar -cf temp.tar "$HAB_ROOT_PATH"/pkgs --transform="s,""${HAB_ROOT_PATH:1}"",hab," --transform="s,tmp,hab,"
57-
xz --compress -6 --threads=0 temp.tar
58-
hab pkg sign --origin "$HAB_ORIGIN" temp.tar.xz results/"$pkg_artifact"
59-
60-
echo "--- :habicat: Uploading ${pkg_ident:?} to ${HAB_BLDR_URL} in the '${channel}' channel"
61-
${hab_binary} pkg upload \
62-
--channel="${channel}" \
63-
--auth="${HAB_AUTH_TOKEN}" \
64-
--no-build \
65-
"results/${pkg_artifact:?}"
66-
67-
echo "<br>* ${pkg_ident} (${BUILD_PKG_TARGET})" | buildkite-agent annotate --append --context "release-manifest"
68-
69-
set_target_metadata "${pkg_ident}" "${pkg_target}"
1+
#!/usr/local/bin/bash
2+
3+
set -euo pipefail
4+
5+
source .expeditor/scripts/release_habitat/shared.sh
6+
7+
# Get secrets! (our auth token and aws creds should be auto-injected but there's a bug:
8+
# https://github.com/chef/ci-studio-common/issues/200)
9+
eval "$(vault-util fetch-secret-env)"
10+
11+
export HAB_BLDR_URL="${PIPELINE_HAB_BLDR_URL}"
12+
13+
14+
echo "--- Executing: brew install protobuf"
15+
brew install protobuf
16+
17+
channel=$(get_release_channel)
18+
19+
echo "--- Channel: $channel - bldr url: $HAB_BLDR_URL"
20+
21+
macos_install_bootstrap_package
22+
23+
declare -g hab_binary
24+
curlbash_hab "x86_64-darwin"
25+
import_keys
26+
27+
macos_use_cert_file_from_linux_cacerts_package
28+
29+
# the macos 11 anka image does not allow us to create a /hab
30+
# directory so we mount off /tmp
31+
export HAB_ROOT_PATH
32+
HAB_ROOT_PATH=$(mktemp -d /tmp/fs-root-XXXXXX)
33+
34+
macos_sync_cache_signing_keys
35+
36+
install_rustup
37+
38+
if [ "$BUILD_PKG_TARGET" == "aarch64-darwin" ]; then
39+
rustup target add aarch64-apple-darwin
40+
fi
41+
42+
# set the rust toolchain
43+
rust_toolchain="$(tail -n 1 rust-toolchain | cut -d'"' -f 2)"
44+
echo "--- :rust: Using Rust toolchain ${rust_toolchain}"
45+
rustc --version # just 'cause I'm paranoid and I want to double check
46+
47+
echo "--- :habicat: Building components/hab"
48+
49+
HAB_BLDR_CHANNEL="${channel}" macos_build components/hab
50+
source results/last_build.env
51+
52+
# This is a hack to rebuild the hart with corrected directory structure
53+
# changing the root from /tmp to /hab
54+
rm -f results/"$pkg_artifact"
55+
tar -cf temp.tar "$HAB_ROOT_PATH"/pkgs --transform="s,""${HAB_ROOT_PATH:1}"",hab," --transform="s,tmp,hab,"
56+
xz --compress -6 --threads=0 temp.tar
57+
hab pkg sign --origin "$HAB_ORIGIN" temp.tar.xz results/"$pkg_artifact"
58+
59+
echo "--- :habicat: Uploading ${pkg_ident:?} to ${HAB_BLDR_URL} in the '${channel}' channel"
60+
${hab_binary} pkg upload \
61+
--channel="${channel}" \
62+
--auth="${HAB_AUTH_TOKEN}" \
63+
--no-build \
64+
"results/${pkg_artifact:?}"
65+
66+
echo "<br>* ${pkg_ident} (${BUILD_PKG_TARGET})" | buildkite-agent annotate --append --context "release-manifest"
67+
68+
set_target_metadata "${pkg_ident}" "${pkg_target}"

0 commit comments

Comments
 (0)