Merge pull request #2977 from Gedochao/maintenance/flaky-scalajs-native-docker-test

Tag flaky docker image with scala.js app test

Author: Gedochao

modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala

@@ -6,10 +6,10 @@ import scala.util.Properties
 
 class NativePackagerTests extends ScalaCliSuite {
   override def group: ScalaCliSuite.TestGroup = ScalaCliSuite.TestGroup.First
-
-  val helloWorldFileName = "HelloWorldScalaCli.scala"
-  val message            = "Hello, world!"
-  val licencePath        = "DummyLICENSE"
+  override def munitFlakyOK: Boolean          = TestUtil.isCI
+  val helloWorldFileName                      = "HelloWorldScalaCli.scala"
+  val message                                 = "Hello, world!"
+  val licencePath                             = "DummyLICENSE"
   val testInputs: TestInputs = TestInputs(
     os.rel / helloWorldFileName ->
       s"""
@@ -415,7 +415,14 @@ class NativePackagerTests extends ScalaCliSuite {
       }
     }
 
-    test("building docker image with scala.js app") {
+    // FIXME for some reason, this test became flaky on the CI
+    if (TestUtil.isNativeCli)
+      test("building docker image with scala.js app".flaky) {
+        TestUtil.retryOnCi() {
+          runJsTest()
+        }
+      }
+    else test("building docker image with scala.js app") {
       TestUtil.retryOnCi() {
         runJsTest()
       }

modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala

@@ -23,7 +23,7 @@ abstract class ScalaCliSuite extends munit.FunSuite {
     }
   }
 
-  override def munitTimeout: Duration = new FiniteDuration(120, TimeUnit.SECONDS)
+  override def munitTimeout: Duration = new FiniteDuration(240, TimeUnit.SECONDS)
 
   override def munitFixtures: List[Fixture[Unit]] = List(testStartEndLogger)
   def group: ScalaCliSuite.TestGroup              = ScalaCliSuite.TestGroup.Third