Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Hab CI to point to LTS 2024 channel #9406

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .expeditor/end_to_end.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ steps:
- label: "[:linux: hup-does-not-abandon-services]"
command:
- .expeditor/scripts/end_to_end/setup_environment.sh dev
- hab pkg install --binlink --channel=stable core/expect
- hab pkg install --binlink --channel=LTS-2024 core/expect
- hab pkg install --channel=\$HAB_BLDR_CHANNEL core/hab-sup core/hab-launcher
- test/end-to-end/hup-does-not-abandon-services.exp
expeditor:
Expand All @@ -58,7 +58,7 @@ steps:
- label: "[:linux: hab-svc-load]"
command:
- .expeditor/scripts/end_to_end/setup_environment.sh dev
- hab pkg install --binlink --channel=stable core/expect
- hab pkg install --binlink --channel=LTS-2024 core/expect
- hab pkg install --channel=\$HAB_BLDR_CHANNEL core/hab-sup core/hab-launcher
- test/end-to-end/hab-svc-load.exp
expeditor:
Expand Down
167 changes: 84 additions & 83 deletions .expeditor/release_habitat.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ expeditor:
PIPELINE_HAB_BLDR_URL: "https://bldr.habitat.sh"
# Necessary to prevent old studios from poisoning builds after core plans refreshes
HAB_STUDIO_SECRET_HAB_PREFER_LOCAL_CHEF_DEPS: "true"
HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "stable"
HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "LTS-2024"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"

steps:
#######################################################################
Expand All @@ -37,15 +38,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build hab]"
command:
- .expeditor/scripts/release_habitat/build_component.sh hab
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build hab]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh hab
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: build hab]"
command:
Expand Down Expand Up @@ -108,15 +109,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build hab-plan-build]"
command:
- .expeditor/scripts/release_habitat/build_component.sh plan-build
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build hab-plan-build]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh plan-build
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: build plan-build-ps1]"
command:
Expand All @@ -141,15 +142,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build hab-backline]"
command:
- .expeditor/scripts/release_habitat/build_component.sh backline
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build hab-backline]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh backline
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- wait

Expand All @@ -163,15 +164,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build hab-studio]"
command:
- .expeditor/scripts/release_habitat/build_component.sh studio
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build hab-studio]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh studio
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: build studio]"
command:
Expand Down Expand Up @@ -199,15 +200,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build launcher]"
command:
- .expeditor/scripts/release_habitat/build_component.sh launcher
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build launcher]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh launcher
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: build launcher]"
command:
Expand All @@ -230,15 +231,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build hab-sup]"
command:
- .expeditor/scripts/release_habitat/build_component.sh sup
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build hab-sup]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh sup
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: build hab-sup]"
command:
Expand Down Expand Up @@ -282,15 +283,15 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: build hab-pkg-export-tar]"
command:
- .expeditor/scripts/release_habitat/build_component.sh pkg-export-tar
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: build hab-pkg-export-tar]"
# command:
# - .expeditor/scripts/release_habitat/build_component.sh pkg-export-tar
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: build hab-pkg-export-tar]"
command:
Expand Down Expand Up @@ -359,16 +360,16 @@ steps:
environment:
- BUILD_PKG_TARGET=x86_64-linux

- label: "[:linux: :two: upload hab binary]"
command:
- .expeditor/scripts/release_habitat/package_and_upload_binary.sh
if: build.creator.name == 'Chef Expeditor' || build.env("UPLOAD_AND_PROMOTE") == 'true'
expeditor:
executor:
docker:
privileged: true
environment:
- BUILD_PKG_TARGET=x86_64-linux-kernel2
# - label: "[:linux: :two: upload hab binary]"
# command:
# - .expeditor/scripts/release_habitat/package_and_upload_binary.sh
# if: build.creator.name == 'Chef Expeditor' || build.env("UPLOAD_AND_PROMOTE") == 'true'
# expeditor:
# executor:
# docker:
# privileged: true
# environment:
# - BUILD_PKG_TARGET=x86_64-linux-kernel2

- label: "[:windows: upload hab binary]"
command:
Expand Down Expand Up @@ -445,15 +446,15 @@ steps:
linux:
privileged: true

- label: ":docker: :two: Upload containers to Docker Hub"
command: .expeditor/scripts/release_habitat/dockerhub_upload.sh
if: build.creator.name == 'Chef Expeditor' || build.env("UPLOAD_AND_PROMOTE") == 'true'
env:
BUILD_PKG_TARGET: "x86_64-linux-kernel2"
expeditor:
executor:
linux:
privileged: true
# - label: ":docker: :two: Upload containers to Docker Hub"
# command: .expeditor/scripts/release_habitat/dockerhub_upload.sh
# if: build.creator.name == 'Chef Expeditor' || build.env("UPLOAD_AND_PROMOTE") == 'true'
# env:
# BUILD_PKG_TARGET: "x86_64-linux-kernel2"
# expeditor:
# executor:
# linux:
# privileged: true

- label: ":docker: :windows: Upload windows 2016 container to Docker Hub"
if: build.creator.name == 'Chef Expeditor' || build.env("UPLOAD_AND_PROMOTE") == 'true'
Expand Down
8 changes: 4 additions & 4 deletions .expeditor/scripts/end_to_end/setup_environment.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Invoke-NativeCommand hab pkg install core/hab-pkg-export-container `
--channel "$Channel" `
--url="$BuilderUrl"

Write-Host "--- Installing latest core/powershell from $BuilderUrl, stable channel"
Write-Host "--- Installing latest core/powershell from $BuilderUrl, LTS-2024 channel"
Invoke-NativeCommand hab pkg install core/powershell `
--binlink `
--force `
--channel=stable `
--channel=LTS-2024 `
--url="$BuilderUrl"
Write-Host "--- Using core/powershell $(pwsh --version)"

Write-Host "--- Installing latest core/pester from $BuilderUrl, stable channel"
Write-Host "--- Installing latest core/pester from $BuilderUrl, LTS-2024 channel"
Invoke-NativeCommand hab pkg install core/pester `
--channel=stable `
--channel=LTS-2024 `
--url="$BuilderUrl"
12 changes: 6 additions & 6 deletions .expeditor/scripts/end_to_end/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,28 @@ sudo -E hab pkg install core/hab-pkg-export-container \
--channel="${channel}" \
--url="${HAB_BLDR_URL}"

echo "--- Installing latest core/netcat from ${HAB_BLDR_URL}, stable channel"
echo "--- Installing latest core/netcat from ${HAB_BLDR_URL}, LTS-2024 channel"
sudo -E hab pkg install core/netcat \
--binlink \
--force \
--channel="stable" \
--channel="LTS-2024" \
--url="${HAB_BLDR_URL}"

echo "--- Installing latest core/powershell from ${HAB_BLDR_URL}, stable channel"
echo "--- Installing latest core/powershell from ${HAB_BLDR_URL}, LTS-2024 channel"
# Binlink to '/usr/local/bin' to ensure we do not run the system installed version. The system
# version is installed in `/usr/bin` which occurs earlier in the PATH than '/bin' (the default)
# binlink location).
sudo -E hab pkg install core/powershell \
--binlink \
--binlink-dir="/usr/local/bin" \
--force \
--channel="stable" \
--channel="LTS-2024" \
--url="${HAB_BLDR_URL}"
echo "--- Using core/powershell version $(pwsh --version)"

echo "--- Installing latest core/pester from ${HAB_BLDR_URL}, stable channel"
echo "--- Installing latest core/pester from ${HAB_BLDR_URL}, LTS-2024 channel"
sudo -E hab pkg install core/pester \
--channel="stable" \
--channel="LTS-2024" \
--url="${HAB_BLDR_URL}"

sudo useradd --system --no-create-home hab
13 changes: 1 addition & 12 deletions .expeditor/scripts/finish_release/sync_acceptance.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
format_version = 1
file_descriptor = "Packages to sync acceptamce from production after release"
file_descriptor = "Packages to sync acceptance from production after release"

# These are all packages that we officially produce in a release.

Expand All @@ -18,17 +18,6 @@ packages = [
"core/hab-pkg-cfize"
]

[[x86_64-linux-kernel2]]
channel = "stable"
packages = [
"core/hab-launcher",
"core/hab",
"core/hab-sup",
"core/hab-studio",
"core/hab-plan-build",
"core/hab-backline"
]

[[x86_64-windows]]
channel = "stable"
packages = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mapfile -t packages_to_promote < <(echo "${channel_pkgs_json}" | \
# Generate the input file
manifest_input_file="manifest_input.txt"
targets=("x86_64-linux"
"x86_64-linux-kernel2"
# "x86_64-linux-kernel2"
"x86_64-windows"
"x86_64-darwin"
"aarch64-darwin")
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/scripts/release_habitat/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ create_archive_from_hart() {
pkg_name="hab-${target}"

case "$target" in
*-linux | *-linux-kernel2)
*-linux)
pkg_artifact="${pkg_name}.tar.gz"
make_tarball "${pkg_name}" "${archive_dir}"
;;
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/scripts/shared.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function Install-Habitat {
$env:path = New-PathString -StartingPath $env:path -Path "c:\hab\bin"

if (Get-Command -Name hab -ErrorAction SilentlyContinue) {
hab pkg install core/hab --binlink --force
hab pkg install core/hab --binlink --force --channel=stable
} else {
."$PSScriptRoot\..\..\components\hab\install.ps1"
."$env:ProgramData\habitat\hab.exe" pkg install core/hab --binlink --force
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/scripts/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ curlbash_hab() {
fi
curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash -s -- -t "$pkg_target"
case "${pkg_target}" in
x86_64-linux | x86_64-linux-kernel2)
x86_64-linux)
hab_binary="/bin/hab"
;;
x86_64-darwin)
Expand Down
1 change: 1 addition & 0 deletions .expeditor/scripts/verify/build_package.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ $env:HAB_CACHE_KEY_PATH="$job_temp_root/keys"
Write-Host "--- :key: Generating fake origin key"
hab origin key generate
Write-Host "--- :hab: Running hab pkg build for $PackagePath"
hab pkg install core/hab-studio --channel=stable

hab studio build $PackagePath -R

Expand Down
1 change: 1 addition & 0 deletions .expeditor/scripts/verify/build_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys"
echo "--- :key: Generating fake origin key"
${hab_binary} origin key generate
echo "--- :hab: Running hab pkg build for $package_path"
hab pkg install core/hab-studio --channel stable
${hab_binary} pkg build "$package_path"
Loading
Loading