HSEARCH-4920 TEST DON'T MERGE

hibernate · Sep 19, 2023 · d63565b · d63565b
1 parent e2d0fcd
commit d63565b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -915,6 +915,10 @@ def pullContainerImages(String mavenArgs) {
 		// and obviously the iterator is not serializable.
 		for (int i = 0; i < containerImageRefs.length; i++) {
 			containerImageRef = containerImageRefs[i]
+			if (containerImageRef ==~ /^(?!((.*\.)?docker\.io))[\w\d\.]+\/[\w\d\.]+\/[\w\d\.]+(:.+)?$/) {
+				// an image not from a docker hub, so let's ignore it:
+				continue
+			}
 			docker.image( containerImageRef ).pull()
 		}
 	}

diff --git a/pom.xml b/pom.xml
@@ -376,8 +376,8 @@
         <test.elasticsearch.version>${version.org.elasticsearch.latest}</test.elasticsearch.version>
 
         <test.elasticsearch.run.elastic.skip>true</test.elasticsearch.run.elastic.skip>
-        <test.elasticsearch.run.elastic.image.name>elastic/elasticsearch</test.elasticsearch.run.elastic.image.name>
-        <test.elasticsearch.run.elastic.image.tag>${test.elasticsearch.version}</test.elasticsearch.run.elastic.image.tag>
+        <test.elasticsearch.run.elastic.image.name>docker.elastic.co/elasticsearch/elasticsearch</test.elasticsearch.run.elastic.image.name>
+        <test.elasticsearch.run.elastic.image.tag>master-SNAPSHOT</test.elasticsearch.run.elastic.image.tag>
 
         <test.elasticsearch.run.opensearch.skip>true</test.elasticsearch.run.opensearch.skip>
         <test.elasticsearch.run.opensearch.image.name>opensearchproject/opensearch</test.elasticsearch.run.opensearch.image.name>