Skip to content

Commit 08a9589

Browse files
committed
Ensure docker images for current architecture are built for testing (#69554)
1 parent feb163d commit 08a9589

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

distribution/docker/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ elasticsearch_distributions {
244244
}
245245

246246
tasks.named("preProcessFixture").configure {
247-
dependsOn elasticsearch_distributions.docker_default, elasticsearch_distributions.docker_oss
247+
dependsOn elasticsearch_distributions.matching { it.architecture == Architecture.current() }
248248
dependsOn "copyNodeKeyMaterial"
249249
doLast {
250250
// tests expect to have an empty repo

gradle/build-scan.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.elasticsearch.gradle.Architecture
12
import org.elasticsearch.gradle.OS
23
import org.elasticsearch.gradle.info.BuildParams
34
import org.gradle.initialization.BuildRequestMetaData
@@ -14,6 +15,7 @@ buildScan {
1415
String nodeName = System.getenv('NODE_NAME')
1516

1617
tag OS.current().name()
18+
tag Architecture.current().name()
1719

1820
// Tag if this build is run in FIPS mode
1921
if (BuildParams.inFipsJvm) {

0 commit comments

Comments
 (0)