Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Exclude the right Docker tests for slim image

Houston Putman456d3ec765d3
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index 4df9b9b525f..6bb89252d51 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -225,7 +225,8 @@ task testDocker(type: TestDockerImageTask, dependsOn: tasks.dockerBuild) {
var excludeCases = new HashSet(Arrays.asList(propertyOrEnvOrDefault("solr.docker.tests.exclude", "SOLR_DOCKER_TESTS_EXCLUDE", ",").split(",")))
if (isImageSlim()) {
// The slim image does not contain the prometheus-exporter.
- excludeCases.add("prometheus-exporter")
+ excludeCases.add("prometheus-exporter-standalone")
+ excludeCases.add("prometheus-exporter-cloud")
}
testCasesExclude.value(excludeCases)
}
@@ -547,7 +548,7 @@ task testDockerfileOfficialSlim(type: TestDockerImageTask, dependsOn: configurat
// This test does not respect the include/exclude properties that `testDocker` does.
// All docker tests will be run, no matter the properties specified.
testCasesInclude.empty()
- testCasesExclude = ['prometheus-exporter']
+ testCasesExclude = ['prometheus-exporter-cloud', 'prometheus-exporter-standalone']
}
task testDockerfileOfficial {