From 6abb0317b2df21082904b51632cf62fb588c268b Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Thu, 9 May 2019 09:30:14 +0300 Subject: [PATCH 1/3] Make packer cache branches explicit 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. --- .ci/packer_cache.sh | 6 ++++++ distribution/bwc/build.gradle | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh index 4533213920c3a..8ac69ff365327 100755 --- a/.ci/packer_cache.sh +++ b/.ci/packer_cache.sh @@ -22,3 +22,9 @@ export JAVA8_HOME="${HOME}"/.java/java8 export JAVA11_HOME="${HOME}"/.java/java11 export JAVA12_HOME="${HOME}"/.java/openjdk12 ./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies +git checkout 7.x +./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies +git checkout 6.8 +./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies +git checkout master + diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 8285d8dae2b0d..2e912076544ba 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -238,12 +238,6 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased createBuildBwcTask(projectName, "${baseDir}/${projectName}", projectArtifact) } - - - createRunBwcGradleTask("resolveAllBwcDependencies") { - args 'resolveAllDependencies' - } - resolveAllDependencies.dependsOn resolveAllBwcDependencies for (e in artifactFiles) { String projectName = e.key From 95da02a42f61e1c479419e42a0a2e0503f82a383 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Tue, 21 May 2019 14:02:54 +0300 Subject: [PATCH 2/3] Figure out relevant versions Without hard coding version numbers --- .ci/packer_cache.sh | 5 ----- .../minimumRuntime/org/elasticsearch/gradle/Version.java | 3 +++ distribution/bwc/build.gradle | 8 ++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh index 8ac69ff365327..adc4f80d4960d 100755 --- a/.ci/packer_cache.sh +++ b/.ci/packer_cache.sh @@ -22,9 +22,4 @@ export JAVA8_HOME="${HOME}"/.java/java8 export JAVA11_HOME="${HOME}"/.java/java11 export JAVA12_HOME="${HOME}"/.java/openjdk12 ./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies -git checkout 7.x -./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies -git checkout 6.8 -./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies -git checkout master diff --git a/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java b/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java index 31738f140878d..1c8216f9e1df7 100644 --- a/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java +++ b/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java @@ -124,4 +124,7 @@ public int compareTo(Version other) { return Integer.compare(getId(), other.getId()); } + public boolean isNextMajor() { + return getRevision() == 0 && getMinor() == 0; + } } diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 2e912076544ba..21c9c7946ba5d 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -239,6 +239,14 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased createBuildBwcTask(projectName, "${baseDir}/${projectName}", projectArtifact) } + createRunBwcGradleTask("resolveAllBwcDependencies") { + args 'resolveAllDependencies' + } + if (Version.fromString(version).isNextMajor()) { + // We only want to resolve dependencies for live versions of master, without cascading this to older versions + resolveAllDependencies.dependsOn resolveAllBwcDependencies + } + for (e in artifactFiles) { String projectName = e.key String buildBwcTask = buildBwcTaskName(projectName) From 37208c6f5fa3df00bc436e57cf811e8d16076127 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Wed, 22 May 2019 18:56:50 +0300 Subject: [PATCH 3/3] PR review --- .../main/minimumRuntime/org/elasticsearch/gradle/Version.java | 3 --- distribution/bwc/build.gradle | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java b/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java index 1c8216f9e1df7..31738f140878d 100644 --- a/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java +++ b/buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/Version.java @@ -124,7 +124,4 @@ public int compareTo(Version other) { return Integer.compare(getId(), other.getId()); } - public boolean isNextMajor() { - return getRevision() == 0 && getMinor() == 0; - } } diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 5cb551998ce87..1a4e4161418ab 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -243,7 +243,8 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased createRunBwcGradleTask("resolveAllBwcDependencies") { args 'resolveAllDependencies' } - if (Version.fromString(version).isNextMajor()) { + Version currentVersion = Version.fromString(version) + if (currentVersion.getMinor() == 0 && currentVersion.getRevision() == 0) { // We only want to resolve dependencies for live versions of master, without cascading this to older versions resolveAllDependencies.dependsOn resolveAllBwcDependencies }