Skip to content

Commit

Permalink
Exclude the right Docker tests for slim image
Browse files Browse the repository at this point in the history
  • Loading branch information
HoustonPutman committed Oct 26, 2023
1 parent 959029c commit 456d3ec
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions solr/docker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 456d3ec

Please sign in to comment.