diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 9750036476d..1a8b8fc2f84 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -136,5 +136,5 @@ artifact_channels: - staging # prod Builder Supervisors update from here - current - # Habitat packages in stable, binary packages available to the world - - stable + # Habitat packages in LTS-2024, binary packages available to the world + - LTS-2024 diff --git a/.expeditor/end_to_end.pipeline.yml b/.expeditor/end_to_end.pipeline.yml index a3cc5a85f95..fa5762954aa 100644 --- a/.expeditor/end_to_end.pipeline.yml +++ b/.expeditor/end_to_end.pipeline.yml @@ -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: @@ -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: diff --git a/.expeditor/scripts/end_to_end/setup_environment.ps1 b/.expeditor/scripts/end_to_end/setup_environment.ps1 index d8ddac85e6c..9b09ac5c8bd 100644 --- a/.expeditor/scripts/end_to_end/setup_environment.ps1 +++ b/.expeditor/scripts/end_to_end/setup_environment.ps1 @@ -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" diff --git a/.expeditor/scripts/end_to_end/setup_environment.sh b/.expeditor/scripts/end_to_end/setup_environment.sh index 0c17ea8ffbd..b61586aaeb0 100755 --- a/.expeditor/scripts/end_to_end/setup_environment.sh +++ b/.expeditor/scripts/end_to_end/setup_environment.sh @@ -36,14 +36,14 @@ 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). @@ -51,13 +51,13 @@ 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 diff --git a/components/sup/src/manager/service/spec.rs b/components/sup/src/manager/service/spec.rs index a5c10230b8e..11ce2802ad2 100644 --- a/components/sup/src/manager/service/spec.rs +++ b/components/sup/src/manager/service/spec.rs @@ -115,7 +115,7 @@ impl ServiceSpec { Self { ident, group: DEFAULT_GROUP.to_string(), bldr_url: DEFAULT_BLDR_URL.to_string(), - channel: ChannelIdent::stable(), + channel: ChannelIdent::lts(), topology: Topology::default(), update_strategy: UpdateStrategy::default(), update_condition: UpdateCondition::default(), @@ -762,7 +762,7 @@ mod test { assert_eq!(spec.binds, vec![ServiceBind::from_str("cache:redis.cache@acmecorp").unwrap(), ServiceBind::from_str("db:postgres.app@acmecorp").unwrap(),]); - assert_eq!(spec.channel, ChannelIdent::stable()); + assert_eq!(spec.channel, ChannelIdent::lts()); assert_eq!(spec.config_from, Some(PathBuf::from("/only/for/development"))); diff --git a/test/end-to-end/multi-supervisor/Dockerfile b/test/end-to-end/multi-supervisor/Dockerfile index beaa26df578..fbbcd02c016 100644 --- a/test/end-to-end/multi-supervisor/Dockerfile +++ b/test/end-to-end/multi-supervisor/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu # Channel from which to install Habitat-related packages -ARG CHANNEL=stable +ARG CHANNEL=LTS-2024 # Bootstrap the installation of Habitat RUN apt-get update && apt-get -y install curl diff --git a/test/end-to-end/multi-supervisor/supervisor/Dockerfile b/test/end-to-end/multi-supervisor/supervisor/Dockerfile index 30521763c61..d60abff8d71 100644 --- a/test/end-to-end/multi-supervisor/supervisor/Dockerfile +++ b/test/end-to-end/multi-supervisor/supervisor/Dockerfile @@ -2,7 +2,7 @@ FROM alpine as build_image # All Supervisor-related packages will be downloaded from this channel # on Builder. -ARG CHANNEL=stable +ARG CHANNEL=LTS-2024 # Always accept the license when we run this image. ENV HAB_LICENSE=accept-no-persist @@ -21,7 +21,7 @@ RUN apk add bash wget \ RUN hab pkg install --channel="${CHANNEL}" core/hab \ && hab pkg install --channel="${CHANNEL}" core/hab-sup \ && hab pkg install --channel="${CHANNEL}" core/hab-launcher \ - && hab pkg install --channel="stable" core/busybox \ + && hab pkg install --channel="LTS-2024" core/busybox \ && hab pkg binlink core/hab -d /hab/bin # Create enough of a filesystem for the Supervisor to operate. We diff --git a/test/end-to-end/test_supplemental_groups.ps1 b/test/end-to-end/test_supplemental_groups.ps1 index e4c8d0446c4..f0a5eab9fac 100644 --- a/test/end-to-end/test_supplemental_groups.ps1 +++ b/test/end-to-end/test_supplemental_groups.ps1 @@ -48,7 +48,7 @@ Describe "supplemental group behavior" { It "should be able to run a service that depends on supplemental groups being set" { # Install the package first so we don't have to wait during # the load. - hab pkg install "habitat-testing/supplemental-group-tester" --channel=stable + hab pkg install "habitat-testing/supplemental-group-tester" --channel=LTS-2024 Load-SupervisorService "habitat-testing/supplemental-group-tester" # The service should not be able to come up if supplemental