Merge pull request #9546 from habitat-sh/fix_release

release uploads aarch64 from x64 docker
habitat-sh · Jan 6, 2025 · b804cec · b804cec
2 parents 0983c4f + a8f07c5
commit b804cec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.expeditor/release_habitat.pipeline.yml b/.expeditor/release_habitat.pipeline.yml
@@ -419,14 +419,15 @@ steps:
             - BUILD_PKG_TARGET=x86_64-linux
 
   - label: "[:linux: upload hab aarch64 binary]"
-    agents:
-      queue: default-privileged-aarch64
-    env:
-      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/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=aarch64-linux
 
   - label: "[:linux: :two: upload hab binary]"
     command:

diff --git a/.expeditor/scripts/release_habitat/package_and_upload_binary.sh b/.expeditor/scripts/release_habitat/package_and_upload_binary.sh
@@ -14,7 +14,7 @@ channel=$(get_release_channel)
 echo "--- Channel: $channel - bldr url: $HAB_BLDR_URL"
 
 declare -g hab_binary
-install_release_channel_hab_binary "$BUILD_PKG_TARGET"
+install_release_channel_hab_binary "x86_64-linux"
 
 import_gpg_keys