Skip to content

Commit c9d04cc

Browse files
alpar-tmark-vieira
authored andcommitted
Make packer cache branches explicit (elastic#41990)
Before this change we would recurse to cache bwc versions. This proved to be problematic due to the number of steps it was generating taking too long. Also this required tricky maintenance to break the recursion for old branches we don't really care about. With this change we now cache specific branches only.
1 parent 35c4c9e commit c9d04cc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.ci/packer_cache.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ export JAVA8_HOME="${HOME}"/.java/java8
2222
export JAVA11_HOME="${HOME}"/.java/java11
2323
export JAVA12_HOME="${HOME}"/.java/openjdk12
2424
./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
25+

distribution/bwc/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,15 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased
239239

240240
createBuildBwcTask(projectName, "${baseDir}/${projectName}", projectArtifact)
241241
}
242-
243242

244243
createRunBwcGradleTask("resolveAllBwcDependencies") {
245244
args 'resolveAllDependencies'
246245
}
247-
resolveAllDependencies.dependsOn resolveAllBwcDependencies
246+
Version currentVersion = Version.fromString(version)
247+
if (currentVersion.getMinor() == 0 && currentVersion.getRevision() == 0) {
248+
// We only want to resolve dependencies for live versions of master, without cascading this to older versions
249+
resolveAllDependencies.dependsOn resolveAllBwcDependencies
250+
}
248251

249252
for (e in artifactFiles) {
250253
String projectName = e.key

0 commit comments

Comments
 (0)