Skip to content

Commit 0c725f1

Browse files
committed
Fix the packer cache script (#38023)
The script is used to create a cache on ephemeral CI workers. Changes: - create and use a `pullFixture` task that always exists regardless of docker support - wire dependencies correctly so any pre fixture setup runs for pull as well - set up java env vars so bwc versions can build
1 parent ca40276 commit 0c725f1

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.ci/packer_cache.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@ while [ -h "$SCRIPT" ] ; do
1616
done
1717

1818
source $(dirname "${SCRIPT}")/java-versions.properties
19-
JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA} ./gradlew --parallel resolveAllDependencies composePull
19+
export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
20+
# We are caching BWC versions too, need these so we can build those
21+
export JAVA8_HOME="${HOME}"/.java/java8
22+
export JAVA11_HOME="${HOME}"/.java/java11
23+
export JAVA12_HOME="${HOME}"/.java/java12
24+
./gradlew --parallel clean pullFixture --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies

buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,17 @@ public void apply(Project project) {
5959
disableTaskByType(tasks, JarHellTask.class);
6060

6161
Task buildFixture = project.getTasks().create("buildFixture");
62+
Task pullFixture = project.getTasks().create("pullFixture");
6263
Task preProcessFixture = project.getTasks().create("preProcessFixture");
6364
buildFixture.dependsOn(preProcessFixture);
65+
pullFixture.dependsOn(preProcessFixture);
6466
Task postProcessFixture = project.getTasks().create("postProcessFixture");
6567

6668
if (dockerComposeSupported(project) == false) {
6769
preProcessFixture.setEnabled(false);
6870
postProcessFixture.setEnabled(false);
6971
buildFixture.setEnabled(false);
72+
pullFixture.setEnabled(false);
7073
return;
7174
}
7275

@@ -81,7 +84,9 @@ public void apply(Project project) {
8184
);
8285

8386
buildFixture.dependsOn(tasks.getByName("composeUp"));
87+
pullFixture.dependsOn(tasks.getByName("composePull"));
8488
tasks.getByName("composeUp").mustRunAfter(preProcessFixture);
89+
tasks.getByName("composePull").mustRunAfter(preProcessFixture);
8590
postProcessFixture.dependsOn(buildFixture);
8691

8792
configureServiceInfoForTask(

0 commit comments

Comments
 (0)