Skip to content

ADH-5978: Fix failed product tests #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 468-develop
Choose a base branch
from
Open

ADH-5978: Fix failed product tests #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f743d8f
ADH-5978: Fix failed product tests
Apr 28, 2025
ff212c3
ADH-5978: Debug log
Apr 28, 2025
8621b91
ADH-5978: Debug log
Apr 28, 2025
0c2a6d8
ADH-5978: Debug log
Apr 29, 2025
8bf8d89
ADH-5978: Debug: add lib
Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ...ino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -346,13 +347,24 @@ private Environment getEnvironment()
if (System.getenv("CONTINUOUS_INTEGRATION") != null) {
container.withEnv("CONTINUOUS_INTEGRATION", "true");
}
log.info("TARGET DEBUG LOG: ");
log.info(new File("testing/trino-product-tests/target").getAbsolutePath());
log.info(Arrays.asList(new File("testing/trino-product-tests/target").list()).toString());

log.info("ROOT DEBUG LOG: ");
log.info(new File("testing/trino-product-tests").getAbsolutePath());
log.info(Arrays.asList(new File("testing/trino-product-tests").list()).toString());

log.info("LIB DEBUG LOG: ");
log.info(new File("testing/trino-product-tests/lib").getAbsolutePath());
log.info(Arrays.asList(new File("testing/trino-product-tests/lib").list()).toString());

// Install Java distribution if necessary
jdkProvider.applyTo(container)
// the test jar is hundreds MB and file system bind is much more efficient
.withFileSystemBind(testJar.getPath(), "/docker/test.jar", READ_ONLY)
.withFileSystemBind(cliJar.getPath(), "/docker/trino-cli", READ_ONLY)
.withFileSystemBind("./testing/trino-product-tests/target/aspectjweaver.jar",
.withFileSystemBind("testing/trino-product-tests/lib/aspectjweaver.jar",
"/docker/aspectjweaver.jar", READ_ONLY)
.withCopyFileToContainer(forClasspathResource("docker/trino-product-tests/common/standard/set-trino-cli.sh"), "/etc/profile.d/set-trino-cli.sh")
.withCommand(ImmutableList.<String>builder()
Expand Down
Binary file added testing/trino-product-tests/lib/aspectjweaver.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions testing/trino-product-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<outputDirectory>${project.basedir}/lib</outputDirectory>
<destFileName>aspectjweaver.jar</destFileName>
<type>jar</type>
</artifactItem>
Expand All @@ -426,7 +426,7 @@
<goals>
<goal>copy</goal>
</goals>
<phase>package</phase>
<phase>compile</phase>
</execution>
</executions>
</plugin>
Expand Down
Loading