Skip to content

Commit

Permalink
set interpreter for aarch64 tests
Browse files Browse the repository at this point in the history
Signed-off-by: Phani Sajja <[email protected]>
  • Loading branch information
sajjaphani committed Oct 18, 2024
1 parent ff04592 commit 781b585
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .expeditor/scripts/verify/run_cargo_test-aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ if [[ -n ${component:-} ]]; then
cd "components/$component"
fi

# We do not have any packages in the stable channel for aarch64 and probably never will.
# Set the HAB_INTERPRETER_IDENT to point to LTS-2024 to proceed with the tests.
export HAB_INTERPRETER_IDENT="core/busybox-static/1.36.1/20240805133911"

# Always add `--quiet` to avoid the noise of compilation in test output.
# The invocation to this script can add `--format pretty` to the test runner
# args (that is, after --, like --nocapture and --test-threads) if the names
Expand Down
9 changes: 3 additions & 6 deletions components/sup/tests/utils/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,9 @@ async fn write_default_metafiles(hab_root: &HabRoot,

// Write metafiles to convert the package to a native package on platforms without package
// support
// TODO: We intentionally use native packages on aarch64-linux platform as the interpreter
// packages core/busybox-static are not yet available publicly on builder. This will cause
// The package to fail when the supervisor attempts to load it. We should use standard
// packages on aarch64-linux once the interpreter package is made publicly available.
#[cfg(not(any(all(target_os = "linux", any(target_arch = "x86_64")),
all(target_os = "windows", target_arch = "x86_64"))))]
#[cfg(not(any(all(target_os = "linux",
any(target_arch = "x86_64", target_arch = "aarch64")),
all(target_os = "windows", target_arch = "x86_64"))))]
{
let pkg_type_metafile = hab_root.pkg_type_path(pkg_origin, pkg_name);
write_metafile(pkg_type_metafile, "native").await?;
Expand Down

0 comments on commit 781b585

Please sign in to comment.