HSEARCH-4920 TEST DON'T MERGE

hibernate · Sep 19, 2023 · 10d0f15 · 10d0f15
1 parent 82cd9f4
commit 10d0f15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -914,6 +914,10 @@ def pullContainerImages(String mavenArgs) {
 		// Cannot use a foreach loop because then Jenkins wants to serialize the iterator,
 		// and obviously the iterator is not serializable.
 		for (int i = 0; i < containerImageRefs.length; i++) {
+			if (containerImageRef.startsWith('docker.elastic.co')) {
+				// an image not from a docker hub, so let's ignore it:
+				continue
+			}
 			containerImageRef = containerImageRefs[i]
 			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>