[solr] branch branch_9_4 updated: Exclude the right Docker tests for slim image

[houston]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch branch_9_4
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9_4 by this push:
     new 85445dbd25d Exclude the right Docker tests for slim image
85445dbd25d is described below

commit 85445dbd25dde31e85e24a2d8a6286cbbd790061
Author: Houston Putman <hous...@apache.org>
AuthorDate: Thu Oct 26 12:44:14 2023 -0400

    Exclude the right Docker tests for slim image
    
    (cherry picked from commit 456d3ec765d377badf62e18835e06d308e6fadd0)
---
 solr/docker/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 {