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
This commit is contained in:
parent
b91d587275
commit
f3379940c6
|
@ -16,4 +16,9 @@ while [ -h "$SCRIPT" ] ; do
|
||||||
done
|
done
|
||||||
|
|
||||||
source $(dirname "${SCRIPT}")/java-versions.properties
|
source $(dirname "${SCRIPT}")/java-versions.properties
|
||||||
JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA} ./gradlew --parallel resolveAllDependencies composePull
|
export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
|
||||||
|
# We are caching BWC versions too, need these so we can build those
|
||||||
|
export JAVA8_HOME="${HOME}"/.java/java8
|
||||||
|
export JAVA11_HOME="${HOME}"/.java/java11
|
||||||
|
export JAVA12_HOME="${HOME}"/.java/java12
|
||||||
|
./gradlew --parallel clean pullFixture --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
|
||||||
|
|
|
@ -59,14 +59,17 @@ public class TestFixturesPlugin implements Plugin<Project> {
|
||||||
disableTaskByType(tasks, JarHellTask.class);
|
disableTaskByType(tasks, JarHellTask.class);
|
||||||
|
|
||||||
Task buildFixture = project.getTasks().create("buildFixture");
|
Task buildFixture = project.getTasks().create("buildFixture");
|
||||||
|
Task pullFixture = project.getTasks().create("pullFixture");
|
||||||
Task preProcessFixture = project.getTasks().create("preProcessFixture");
|
Task preProcessFixture = project.getTasks().create("preProcessFixture");
|
||||||
buildFixture.dependsOn(preProcessFixture);
|
buildFixture.dependsOn(preProcessFixture);
|
||||||
|
pullFixture.dependsOn(preProcessFixture);
|
||||||
Task postProcessFixture = project.getTasks().create("postProcessFixture");
|
Task postProcessFixture = project.getTasks().create("postProcessFixture");
|
||||||
|
|
||||||
if (dockerComposeSupported(project) == false) {
|
if (dockerComposeSupported(project) == false) {
|
||||||
preProcessFixture.setEnabled(false);
|
preProcessFixture.setEnabled(false);
|
||||||
postProcessFixture.setEnabled(false);
|
postProcessFixture.setEnabled(false);
|
||||||
buildFixture.setEnabled(false);
|
buildFixture.setEnabled(false);
|
||||||
|
pullFixture.setEnabled(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +84,9 @@ public class TestFixturesPlugin implements Plugin<Project> {
|
||||||
);
|
);
|
||||||
|
|
||||||
buildFixture.dependsOn(tasks.getByName("composeUp"));
|
buildFixture.dependsOn(tasks.getByName("composeUp"));
|
||||||
|
pullFixture.dependsOn(tasks.getByName("composePull"));
|
||||||
tasks.getByName("composeUp").mustRunAfter(preProcessFixture);
|
tasks.getByName("composeUp").mustRunAfter(preProcessFixture);
|
||||||
|
tasks.getByName("composePull").mustRunAfter(preProcessFixture);
|
||||||
postProcessFixture.dependsOn(buildFixture);
|
postProcessFixture.dependsOn(buildFixture);
|
||||||
|
|
||||||
configureServiceInfoForTask(
|
configureServiceInfoForTask(
|
||||||
|
|
Loading…
Reference in New Issue