From 86fa6e890c503fc52706169c8aff915190b58e12 Mon Sep 17 00:00:00 2001 From: Andras Salamon Date: Fri, 31 May 2024 10:34:56 +0000 Subject: [PATCH] Fixing integration test starting Signed-off-by: Andras Salamon --- .../groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy | 4 ++-- .../fixture/hadoop/services/HadoopServiceDescriptor.groovy | 2 +- .../fixture/hadoop/services/HiveServiceDescriptor.groovy | 2 +- .../hadoop/services/SparkYarnServiceDescriptor.groovy | 4 ++-- gradle.properties | 1 + .../hadoop/test/fixture/minikdc/MiniKdcFixture.java | 5 ++++- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy index d39e73f0c..feac1af9c 100644 --- a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy @@ -316,8 +316,8 @@ class BuildPlugin implements Plugin { 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. diff --git a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HadoopServiceDescriptor.groovy b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HadoopServiceDescriptor.groovy index fa7cb4bea..cd89692c5 100644 --- a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HadoopServiceDescriptor.groovy +++ b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HadoopServiceDescriptor.groovy @@ -72,7 +72,7 @@ class HadoopServiceDescriptor implements ServiceDescriptor { @Override Version defaultVersion() { - return new Version(3, 3, 2) + return new Version(3, 3, 6) } @Override diff --git a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HiveServiceDescriptor.groovy b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HiveServiceDescriptor.groovy index dfe07946d..41be0da32 100644 --- a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HiveServiceDescriptor.groovy +++ b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/HiveServiceDescriptor.groovy @@ -69,7 +69,7 @@ class HiveServiceDescriptor implements ServiceDescriptor { @Override Version defaultVersion() { - return new Version(3, 1, 2) + return new Version(3, 1, 3) } @Override diff --git a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy index 4d0ccc7db..f1cb089de 100644 --- a/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy +++ b/buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy @@ -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 diff --git a/gradle.properties b/gradle.properties index a1b2e85d0..ca1935c43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file diff --git a/test/fixtures/minikdc/src/main/java/org/opensearch/hadoop/test/fixture/minikdc/MiniKdcFixture.java b/test/fixtures/minikdc/src/main/java/org/opensearch/hadoop/test/fixture/minikdc/MiniKdcFixture.java index 951696a41..162c2c703 100644 --- a/test/fixtures/minikdc/src/main/java/org/opensearch/hadoop/test/fixture/minikdc/MiniKdcFixture.java +++ b/test/fixtures/minikdc/src/main/java/org/opensearch/hadoop/test/fixture/minikdc/MiniKdcFixture.java @@ -82,6 +82,9 @@ public static void main(String[] args) throws Exception { // Provisioning info Map userToPassword = new HashMap<>(); Map> 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 allKeytabUsers = new HashSet<>(); // Create default KDC Conf @@ -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); } -} \ No newline at end of file +}