CI yaml fixed after PR 60 changes, Whitelist regexp fix

Karm · Oct 29, 2021 · 073091f · 073091f
1 parent a8696e2
commit 073091f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/builder-image-apps/quarkus-vertx/quarkus_2.4.x.patch b/builder-image-apps/quarkus-vertx/quarkus_2.4.x.patch
@@ -0,0 +1,13 @@
+diff --git a/builder-image-apps/quarkus-vertx/src/main/docker/Dockerfile.native b/builder-image-apps/quarkus-vertx/src/main/docker/Dockerfile.native
+index 70ec986..2f44460 100644
+--- a/builder-image-apps/quarkus-vertx/src/main/docker/Dockerfile.native
++++ b/builder-image-apps/quarkus-vertx/src/main/docker/Dockerfile.native
+@@ -3,7 +3,7 @@ RUN microdnf --enablerepo=ubi-8-baseos-debug --enablerepo=ubi-8-appstream-debug
+ WORKDIR /work/
+ COPY target/quarkus-runner /work/application
+ COPY target/quarkus-runner.debug /work/application.debug
+-COPY target/sources /work/sources
++COPY target/quarkus-native-image-source-jar/sources /work/sources
+ RUN chmod 775 /work -R
+ EXPOSE 8080
+ CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/testsuite/src/it/java/org/graalvm/tests/integration/DebugSymbolsTest.java b/testsuite/src/it/java/org/graalvm/tests/integration/DebugSymbolsTest.java
@@ -245,6 +245,11 @@ public void debugSymbolsQuarkusContainer(TestInfo testInfo) throws IOException,
             stopAllRunningContainers();
             Files.createDirectories(Paths.get(appDir.getAbsolutePath() + File.separator + "logs"));
 
+            if (QUARKUS_VERSION.startsWith("2.4")) {
+                runCommand(getRunCommand("git", "apply", "quarkus_2.4.x.patch"),
+                        Path.of(BASE_DIR, Apps.DEBUG_QUARKUS_BUILDER_IMAGE_VERTX.dir).toFile());
+            }
+
             // Build & Run
             processLog = new File(appDir.getAbsolutePath() + File.separator + "logs" + File.separator + "build-and-run.log");
             builderRoutine(app.buildAndRunCmds.cmds.length, app, report, cn, mn, appDir, processLog);
@@ -314,6 +319,10 @@ public void debugSymbolsQuarkusContainer(TestInfo testInfo) throws IOException,
             cleanup(null, cn, mn, report, app, processLog);
             stopAllRunningContainers();
             removeContainers(app.runtimeContainer.name, "quarkus_test_db");
+            if (QUARKUS_VERSION.startsWith("2.4")) {
+                runCommand(getRunCommand("git", "apply", "-R", "quarkus_2.4.x.patch"),
+                        Path.of(BASE_DIR, Apps.DEBUG_QUARKUS_BUILDER_IMAGE_VERTX.dir).toFile());
+            }
         }
     }
 

diff --git a/testsuite/src/it/java/org/graalvm/tests/integration/utils/WhitelistLogLines.java b/testsuite/src/it/java/org/graalvm/tests/integration/utils/WhitelistLogLines.java
@@ -74,7 +74,7 @@ public enum WhitelistLogLines {
             // Windows specific warning, O.K.
             Pattern.compile(".*objcopy executable not found in PATH.*"),
             Pattern.compile(".*That will result in a larger native image.*"),
-            Pattern.compile(".*That also means that resulting native executable is larger*"),
+            Pattern.compile(".*That also means that resulting native executable is larger.*"),
             Pattern.compile(".*contain duplicate files, e.g. javax/activation/ActivationDataFlavor.class.*"),
             Pattern.compile(".*contain duplicate files, e.g. javax/servlet/http/HttpUtils.class.*"),
             Pattern.compile(".*contain duplicate files, e.g. javax/annotation/ManagedBean.class.*"),
@@ -100,7 +100,10 @@ public enum WhitelistLogLines {
             // Specific Podman version warning about the way we start gdb in an already running container; harmless.
             Pattern.compile(".*The --tty and --interactive flags might not work properly.*"),
             // Expected part of the app log
-            Pattern.compile(".*'table \"fruits\" does not exist, skipping'.*")
+            Pattern.compile(".*'table \"fruits\" does not exist, skipping'.*"),
+            // Not sure, definitely not Mandrel related though
+            Pattern.compile(".*xml-apis:xml-apis:jar:.* has been relocated to xml-apis:xml-apis:jar:.*"),
+            Pattern.compile(".*io.quarkus:quarkus-vertx-web:jar:.* has been relocated to io.quarkus:quarkus-reactive-routes:jar:.*")
     }),
 
     HELIDON_QUICKSTART_SE(new Pattern[]{