Skip to content
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.

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

Fixing integration test starting #477

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ class BuildPlugin implements Plugin<Project> {
resolve.force("commons-cli:commons-cli:1.2")

resolve.eachDependency { DependencyResolveDetails details ->
// There are tons of slf4j-* variants. Search for all of them, and lock them down.
if (details.requested.name.contains("slf4j-")) {
// There are tons of slf4j-* variants. Search for all of them, and lock them down (except slf4j-reload4j).
if (details.requested.name.contains("slf4j-") && (!details.requested.name.contains("slf4j-reload4j"))) {
details.useVersion "1.7.6"
}
// Be careful with log4j version settings as they can be easily missed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class HadoopServiceDescriptor implements ServiceDescriptor {

@Override
Version defaultVersion() {
return new Version(3, 3, 2)
return new Version(3, 3, 6)
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class HiveServiceDescriptor implements ServiceDescriptor {

@Override
Version defaultVersion() {
return new Version(3, 1, 2)
return new Version(3, 1, 3)
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ class SparkYarnServiceDescriptor implements ServiceDescriptor {

@Override
Version defaultVersion() {
return new Version(3, 2, 4)
return new Version(3, 4, 3)
}

String hadoopVersionCompatibility() {
// The spark artifacts that interface with Hadoop have a hadoop version in their names.
// This version is not always a version that Hadoop still distributes.
return "3.2"
return "3"
}

@Override
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ org.gradle.parallel=true
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx1024M
org.gradle.configureondemand=true
systemProp.https.protocols=TLSv1.2
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public static void main(String[] args) throws Exception {
// Provisioning info
Map<String, String> userToPassword = new HashMap<>();
Map<String, List<String>> keytabToUsers = new HashMap<>();
keytabToUsers.put("opensearch.keytab", Arrays.asList("opensearch"));
keytabToUsers.put("hadoop.keytab", Arrays.asList("nn/build.ci.opensearch.org", "dn/build.ci.opensearch.org", "rm/build.ci.opensearch.org", "nm/build.ci.opensearch.org", "jhs/build.ci.opensearch.org"));
keytabToUsers.put("client.keytab", Arrays.asList("client/build.ci.opensearch.org"));
Set<String> allKeytabUsers = new HashSet<>();

// Create default KDC Conf
Expand Down Expand Up @@ -202,4 +205,4 @@ public void run() {
Files.write(tmp, portFileContent.getBytes(StandardCharsets.UTF_8));
Files.move(tmp, workDirPath.resolve(PORT_FILE_NAME), StandardCopyOption.ATOMIC_MOVE);
}
}
}
Loading