Skip to content

Fix CI runs from forks #17965

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

Merged
findepi merged 1 commit into from
Jun 20, 2023
Merged

Fix CI runs from forks #17965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 3 additions & 14 deletions .../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class EnvSinglenodeDeltaLakeOss

private static final String SPARK_CONTAINER_NAME = "spark";

private static final String DEFAULT_S3_BUCKET_NAME = "trino-ci-test";
private static final String S3_BUCKET_NAME = "test-bucket";
Copy link
Copy Markdown
Contributor

@findinpath findinpath Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for context, EnvSinglenodeHudi uses the same strategy as you did here:

https://github.com/trinodb/trino/blob/0ef6960cc7b4773527d8c05899ac1f78af79d158/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHudi.java

Copy link
Copy Markdown
Member Author

@findepi findepi Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-> #17981


private final DockerFiles dockerFiles;
private final PortBinder portBinder;
Expand All @@ -86,8 +86,6 @@ public EnvSinglenodeDeltaLakeOss(
@Override
public void extendEnvironment(Environment.Builder builder)
{
String s3Bucket = getS3Bucket();

// Using hdp3.1 so we are using Hive metastore with version close to versions of hive-*.jars Spark uses
builder.configureContainer(HADOOP, container -> {
container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImagesVersion);
Expand All @@ -100,7 +98,7 @@ public void extendEnvironment(Environment.Builder builder)
CONTAINER_TRINO_ETC + "/catalog/delta.properties");

builder.configureContainer(TESTS, dockerContainer -> {
dockerContainer.withEnv("S3_BUCKET", s3Bucket)
dockerContainer.withEnv("S3_BUCKET", S3_BUCKET_NAME)
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-hive3.yaml")),
CONTAINER_TEMPTO_PROFILE_CONFIG);
Expand All @@ -121,7 +119,7 @@ public void extendEnvironment(Environment.Builder builder)
throw new UncheckedIOException(e);
}
builder.configureContainer(MINIO_CONTAINER_NAME, container ->
container.withCopyFileToContainer(forHostPath(minioBucketDirectory), "/data/" + s3Bucket));
container.withCopyFileToContainer(forHostPath(minioBucketDirectory), "/data/" + S3_BUCKET_NAME));

configureTempto(builder, configDir);
}
Expand All @@ -139,13 +137,4 @@ private DockerContainer createSparkContainer()

return container;
}

private String getS3Bucket()
{
String s3Bucket = System.getenv("S3_BUCKET");
if (s3Bucket == null) {
s3Bucket = DEFAULT_S3_BUCKET_NAME;
}
return s3Bucket;
}
}