Skip to content

Commit

Permalink
Added channel bump to LTS for common files
Browse files Browse the repository at this point in the history
Signed-off-by: sougata-progress <sougatab@progress.com>
  • Loading branch information
sougata-progress committed Jul 23, 2024
1 parent 3eeb8b5 commit 37293a0
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
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
4 changes: 2 additions & 2 deletions components/sup/src/manager/service/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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")));

Expand Down
2 changes: 1 addition & 1 deletion test/end-to-end/multi-supervisor/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/end-to-end/multi-supervisor/supervisor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/end-to-end/test_supplemental_groups.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 37293a0

Please sign in to comment.