Skip to content

Commit 0937c3f

Browse files
authored
Separate encrypted repository plugin integ tests (#72959)
The encrypted repository module supports encryption with existing repository plugins. Currently the integration tests with these plugins pull in all of the plugins into the same test classpath. That can cause problems when the dependencies of those repositories need to differ. This commit splits the tests into separate qa subprojects.
1 parent 2dca93f commit 0937c3f

File tree

8 files changed

+25
-14
lines changed

8 files changed

+25
-14
lines changed

x-pack/plugin/repository-encrypted/build.gradle

+1-14
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ evaluationDependsOn(xpackModule('core'))
22

33
apply plugin: 'elasticsearch.internal-es-plugin'
44
apply plugin: 'elasticsearch.internal-cluster-test'
5+
apply plugin: 'elasticsearch.internal-test-artifact'
56
esplugin {
67
name 'repository-encrypted'
78
description 'Elasticsearch Expanded Pack Plugin - client-side encrypted repositories.'
@@ -14,18 +15,4 @@ dependencies {
1415
// necessary for the license check
1516
compileOnly project(path: xpackModule('core'))
1617
testImplementation(testArtifact(project(xpackModule('core'))))
17-
18-
// required for integ tests of encrypted FS repository
19-
internalClusterTestImplementation project(":test:framework")
20-
// required for integ tests of encrypted cloud repositories
21-
internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
22-
internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
23-
internalClusterTestImplementation(testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')) {
24-
// HACK, resolves jar hell, such as:
25-
// jar1: jakarta.xml.bind/jakarta.xml.bind-api/2.3.2/8d49996a4338670764d7ca4b85a1c4ccf7fe665d/jakarta.xml.bind-api-2.3.2.jar
26-
// jar2: javax.xml.bind/jaxb-api/2.2.2/aeb3021ca93dde265796d82015beecdcff95bf09/jaxb-api-2.2.2.jar
27-
exclude group: 'javax.xml.bind', module: 'jaxb-api'
28-
}
29-
// for encrypted GCS repository integ tests
30-
internalClusterTestRuntimeOnly 'com.google.guava:guava:26.0-jre'
3118
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
apply plugin: 'elasticsearch.internal-cluster-test'
3+
apply plugin: 'elasticsearch.java'
4+
5+
dependencies {
6+
internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
7+
internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
8+
}

x-pack/plugin/repository-encrypted/qa/build.gradle

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
apply plugin: 'elasticsearch.internal-cluster-test'
3+
apply plugin: 'elasticsearch.java'
4+
5+
dependencies {
6+
internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
7+
internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
apply plugin: 'elasticsearch.internal-cluster-test'
3+
apply plugin: 'elasticsearch.java'
4+
5+
dependencies {
6+
internalClusterTestImplementation testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')
7+
internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
8+
}

0 commit comments

Comments
 (0)