Force linux/amd64 platform

fossas · Jun 5, 2024 · e65787b · e65787b
1 parent 7fb4581
commit e65787b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tests/it/jar.rs b/tests/it/jar.rs
@@ -68,8 +68,10 @@ fn jars_in_container(container: &str) -> Vec<DiscoveredJar> {
     // but since this is only for testing I think it's easier to interact via the shell.
     let sh = xshell::Shell::new().expect("create shell");
 
+    // Force the `linux/amd64` platform when pulling, since that's what CI runs in.
+    // This way local tests work even on M-series macOS, and CI works even though it's linux.
     debug!("pulling container");
-    xshell::cmd!(sh, "docker pull {container}")
+    xshell::cmd!(sh, "docker pull --platform linux/amd64 {container}")
         .quiet()
         .run()
         .expect("pull container");

diff --git a/tests/it/jar/expect/hazelcast_managementcenter_5_3_1.rs b/tests/it/jar/expect/hazelcast_managementcenter_5_3_1.rs
@@ -23,11 +23,11 @@ pub fn list() -> Vec<DiscoveredJar> {
             },
         ),
         DiscoveredJar::new(
-            "usr/lib/jvm/java-17-openjdk-17.0.7.0.7-3.el8.aarch64/lib/jrt-fs.jar",
+            "usr/lib/jvm/java-17-openjdk-17.0.7.0.7-3.el8.x86_64/lib/jrt-fs.jar",
             combined! {
                 Kind::JarClassV1 => "1b9d4816dad40a7922d991be24f0f1bc4bffaf271ab45b9ba32f123a932dd807",
                 Kind::JarRawV1 => "3788fc905d4f2aaf615252c8fcbfc1ec8fdc25b4538f194603b79d9d571ab7d4",
-                Kind::RawSha256 => "2da0df083e22006770f4c2c19a6212ec266ea29a7901fd1bef5dc2c01eec7394",
+                Kind::RawSha256 => "f05c638cc96a6e119aef7044764c189a089ed9abfbd765efe33774bc94afa0d5",
             },
         ),
     ]