Don't do BWC packaing tests if disabled (#39397)

Packaging tests did not honor bwc tests being off. This was also the reason for which we were building the BWC versinons even if the tests are off, so this closes #35347.
elastic · Feb 27, 2019 · bf7e8a6 · bf7e8a6
1 parent 17fad6e
commit bf7e8a6
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
@@ -191,26 +191,32 @@ class VagrantTestPlugin implements Plugin<Project> {
             dependencies.add(project.dependencies.project(path: ":distribution:${it}", configuration: 'default'))
         }
 
-        // The version of elasticsearch that we upgrade *from*
-        VersionCollection.UnreleasedVersionInfo unreleasedInfo = project.bwcVersions.unreleasedInfo(upgradeFromVersion)
-        if (unreleasedInfo != null) {
-            // handle snapshots pointing to bwc build
-            UPGRADE_FROM_ARCHIVES.each {
-                dependencies.add(project.dependencies.project(
-                        path: ":distribution:bwc:${unreleasedInfo.gradleProjectName}", configuration: it))
-                if (upgradeFromVersion.onOrAfter('6.3.0')) {
+        if (project.ext.bwc_tests_enabled) {
+            // The version of elasticsearch that we upgrade *from*
+            // we only add them as dependencies if the bwc tests are enabled, so we don't trigger builds otherwise
+            VersionCollection.UnreleasedVersionInfo unreleasedInfo = project.bwcVersions.unreleasedInfo(upgradeFromVersion)
+            if (unreleasedInfo != null) {
+                // handle snapshots pointing to bwc build
+                UPGRADE_FROM_ARCHIVES.each {
                     dependencies.add(project.dependencies.project(
-                            path: ":distribution:bwc:${unreleasedInfo.gradleProjectName}", configuration: "oss-${it}"))
+                            path: ":distribution:bwc:${unreleasedInfo.gradleProjectName}", configuration: it))
+                    if (upgradeFromVersion.onOrAfter('6.3.0')) {
+                        dependencies.add(project.dependencies.project(
+                                path: ":distribution:bwc:${unreleasedInfo.gradleProjectName}", configuration: "oss-${it}"))
+                    }
                 }
-            }
-        } else {
-            UPGRADE_FROM_ARCHIVES.each {
-                // The version of elasticsearch that we upgrade *from*
-                dependencies.add("downloads.${it}:elasticsearch:${upgradeFromVersion}@${it}")
-                if (upgradeFromVersion.onOrAfter('6.3.0')) {
-                    dependencies.add("downloads.${it}:elasticsearch-oss:${upgradeFromVersion}@${it}")
+            } else {
+                UPGRADE_FROM_ARCHIVES.each {
+                    // The version of elasticsearch that we upgrade *from*
+                    dependencies.add("downloads.${it}:elasticsearch:${upgradeFromVersion}@${it}")
+                    if (upgradeFromVersion.onOrAfter('6.3.0')) {
+                        dependencies.add("downloads.${it}:elasticsearch-oss:${upgradeFromVersion}@${it}")
+                    }
                 }
             }
+        } else {
+            // Upgrade tests will go from current to current when the BWC tests are disabled to skip real BWC tests.
+            upgradeFromVersion = Version.fromString(project.version)
         }
 
         for (Object dependency : dependencies) {