fixes for release pipeline (aarch64)

.expeditor/release_habitat.pipeline.yml

@@ -118,7 +118,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh plan-build
@@ -162,7 +162,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh backline
@@ -195,7 +195,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh studio
@@ -242,7 +242,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh launcher
@@ -284,7 +284,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh sup
@@ -326,7 +326,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh pkg-export-container
@@ -356,7 +356,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/build_component.sh pkg-export-tar
@@ -422,7 +422,7 @@ steps:
     agents:
       queue: default-privileged-aarch64
     env:
-      HAB_FALLBACK_CHANNEL: "LTS-2024"
+      HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/release_habitat/package_and_upload_binary.sh

.expeditor/scripts/release_habitat/build_component.sh

@@ -33,6 +33,9 @@ ${hab_binary} studio rm
 
 echo "--- :habicat: Building components/${component} using ${hab_binary}"
 
+# Set the refresh channel to the release channel.
+export HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL="${channel}"
+
 HAB_BLDR_CHANNEL="${channel}" ${hab_binary} pkg build "components/${component}"
 source results/last_build.env
 

.expeditor/scripts/verify/build_package-aarch64.sh

@@ -5,7 +5,7 @@ set -eou pipefail
 package_path=${1?package_path argument required}
 
 # Install hab from a temporarily uploaded aarch64 package
-curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash -s -- -t "$BUILD_PKG_TARGET" -c "$HAB_FALLBACK_CHANNEL" -v 1.6.1178
+curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash -s -- -t "$BUILD_PKG_TARGET"
 
 # Since we are only verifying we don't have build failures, make everything
 # temp!
@@ -17,14 +17,7 @@ JOB_TEMP_ROOT=$(mktemp -d /tmp/job-root-XXXXXX)
 export HAB_CACHE_KEY_PATH
 HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys"
 
-export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL
-HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL="$HAB_FALLBACK_CHANNEL"
-export HAB_PREFER_LOCAL_CHEF_DEPS="true"
-
 echo "--- :key: Generating temporary origin key"
 hab origin key generate "$HAB_ORIGIN"
 echo "--- :hab: Running hab pkg build for $package_path"
-# Install the temporarily built hab-studio.
-# Once hab is released in the LTS channel, this step may no longer be required.
-hab pkg install core/hab-studio -c "$HAB_FALLBACK_CHANNEL"
 hab pkg build "$package_path"

.expeditor/scripts/verify/run_cargo_test-aarch64.sh

@@ -3,7 +3,7 @@
 set -eou pipefail
 
 # Install hab from a temporarily uploaded aarch64 package
-curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash -s -- -t aarch64-linux -c lts24-aarch64-linux -v 1.6.1178
+curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash -s -- -t aarch64-linux
 
 # shellcheck source=.expeditor/scripts/shared.sh
 source .expeditor/scripts/verify/shared.sh

.expeditor/verify.pipeline.yml

@@ -853,7 +853,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh test-services/test-probe
@@ -886,7 +885,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/backline
@@ -915,7 +913,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/hab
@@ -944,7 +941,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/launcher
@@ -991,7 +987,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/pkg-export-container
@@ -1020,7 +1015,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/pkg-export-tar
@@ -1063,7 +1057,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/plan-build
@@ -1092,7 +1085,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/studio
@@ -1121,7 +1113,6 @@ steps:
       HAB_LICENSE: "accept-no-persist"
       HAB_BLDR_CHANNEL: "LTS-2024"
       HAB_REFRESH_CHANNEL: "LTS-2024"
-      HAB_FALLBACK_CHANNEL: "lts24-aarch64-linux"
       BUILD_PKG_TARGET: "aarch64-linux"
     command:
       - sudo -E .expeditor/scripts/verify/build_package-aarch64.sh components/sup

components/studio/bin/hab-studio.sh

@@ -1055,15 +1055,30 @@ umount_fs() {
         # Filesystem is confirmed umounted, return success
         return 0
       else
+        # TODO: The retry mechanism with an increasing delay has been added 
+        # to address potential race conditions: if the `umount` operation 
+        # is performed asynchronously, the filesystem might still be reported 
+        # as mounted during the retries while the unmounting is in progress. 
+        # By incrementally increasing the delay between retries (starting with 
+        # a 5-second delay and increasing with each attempt), we aim to account 
+        # for such races and give the system more time to process the unmount 
+        # operation. This approach provides a balance between responsiveness 
+        # and allowing sufficient time for the unmount process to complete. 
+        # If this still impacts user experience, further adjustments such as 
+        # dynamic retry intervals or enhanced detection mechanisms could be 
+        # explored.
+        RETRY_DELAY=5
+        MAX_RETRIES=5
+        i=1
+        while [ "$i" -le "$MAX_RETRIES" ] 
+        do 
+            sleep $((RETRY_DELAY * i))  # Delay increases with each retry
+            if ! is_fs_mounted "$_mount_point"; then
+                return 0
+            fi
+            i=$((i+1))
+        done
         # Despite a successful umount, filesystem is still mounted
-        #
-        # TODO fn: there may a race condition here: if the `umount` is
-        # performed asynchronously then it might still be reported as mounted
-        # when the umounting is still queued up. We're erring on the side of
-        # catching any possible races here to determine if there's a problem or
-        # not. If this unduly impacts user experience then an alternate
-        # approach is to wait/poll until the filesystem is unmounted (with a
-        # deadline to abort).
         >&2 echo "After unmounting filesystem '$_mount_point', the mount \
 persisted. Check that the filesystem is no longer in the mounted using \
 \`mount(8)'and retry the last command."

components/studio/libexec/hab-studio-type-default.sh

@@ -101,6 +101,9 @@ finish_setup() {
   _hab pkg binlink core/bash bash
   _hab pkg binlink core/bash sh
 
+  # binlink sleep command
+  _hab pkg binlink "$coreutils_path/bin/sleep" sleep
+
   # Create a wrapper to `build` so that any calls to it have a super-stripped
   # `$PATH` and not whatever augmented version is currently in use. This should
   # mean that running `build` from inside a `studio enter` and running `studio