Test upgrading to the default distribution

qa/build.gradle

@@ -2,6 +2,25 @@
 import org.elasticsearch.gradle.test.RestIntegTestTask
 
 subprojects { Project subproj ->
+  subproj.ext {
+    String bwcFlavor = System.getProperty('bwcFlavor')
+    switch (bwcFlavor) {
+    case 'oss':
+      runOssUpgrades = true;
+      runDefaultUpgrades = false;
+      break;
+    case 'default':
+      runOssUpgrades = false;
+      runDefaultUpgrades = true;
+      break;
+    case null:
+      runOssUpgrades = true;
+      runDefaultUpgrades = true;
+      break;
+    default:
+      throw new InvalidUserDataException("Unknown bwc flavor ${bwcFlavor}")
+    }
+  }
   subproj.tasks.withType(RestIntegTestTask) {
     subproj.extensions.configure("${it.name}Cluster") { cluster ->
       cluster.distribution = 'oss-zip'

qa/full-cluster-restart/build.gradle

@@ -30,9 +30,13 @@ task bwcTest {
   description = 'Runs backwards compatibility tests.'
   group = 'verification'
 }
+task integTest {
+  description = 'Runs backwards comaptibility tests for recent versions.'
+  group = 'verification'
+}
 
-for (Version version : bwcVersions.indexCompatible) {
-  String baseName = "v${version}"
+void setupBwcTests(Version version, String fromDistribution, String toDistribution) {
+  String baseName = "v${version}-${fromDistribution}-to-${toDistribution}"
 
   Task oldClusterTest = tasks.create(name: "${baseName}#oldClusterTest", type: RestIntegTestTask) {
     mustRunAfter(precommit)
@@ -49,6 +53,7 @@ for (Version version : bwcVersions.indexCompatible) {
     numBwcNodes = 2
     numNodes = 2
     clusterName = 'full-cluster-restart'
+    distribution = fromDistribution
 
     // some tests rely on the translog not being flushed
     setting 'indices.memory.shard_inactive_time', '20m'
@@ -71,6 +76,7 @@ for (Version version : bwcVersions.indexCompatible) {
         "${baseName}#oldClusterTestCluster#node0.stop",
         "${baseName}#oldClusterTestCluster#node1.stop"
     clusterName = 'full-cluster-restart'
+    distribution = toDistribution
 
     // some tests rely on the translog not being flushed
     setting 'indices.memory.shard_inactive_time', '20m'
@@ -96,19 +102,29 @@ for (Version version : bwcVersions.indexCompatible) {
 
   if (project.bwc_tests_enabled) {
     bwcTest.dependsOn(versionBwcTest)
+    if (bwcVersions.snapshotsIndexCompatible.contains(version)) {
+      // basic integ tests includes testing bwc against the most recent version
+      integTest.dependsOn(versionBwcTest)
+    }
   }
 }
 
-test.enabled = false // no unit tests for rolling upgrades, only the rest integration test
+test.enabled = false // no unit tests for full cluster upgrades, only the rest integration test
 
-// basic integ tests includes testing bwc against the most recent version
-task integTest {
-  if (project.bwc_tests_enabled) {
-    for (final def version : bwcVersions.snapshotsIndexCompatible) {
-      dependsOn "v${version}#bwcTest"
-    }
+String bwcFlavor = System.getProperty('bwcFlavor')
+for (Version version : bwcVersions.indexCompatible) {
+  if (runOssUpgrades) {
+    setupBwcTests(version, 'oss-zip', 'oss-zip')
+  }
+  if (runDefaultUpgrades) {
+    /*
+     * If the source version is before xpack was opened then test upgrading
+     * from OSS to the default distribution because we expect that'll be
+     * fairly common. If it is after opening xpack then test upgrading xpack
+     * default to xpack default. zip-to-zip covers both of those cases.
+     */
+    setupBwcTests(version, 'zip', 'zip')
   }
 }
 
 check.dependsOn(integTest)
-

qa/rolling-upgrade/build.gradle

@@ -28,9 +28,13 @@ task bwcTest {
   description = 'Runs backwards compatibility tests.'
   group = 'verification'
 }
+task integTest {
+  description = 'Runs backwards comaptibility tests for recent versions.'
+  group = 'verification'
+}
 
-for (Version version : bwcVersions.wireCompatible) {
-  String baseName = "v${version}"
+void setupBwcTests(Version version, String fromDistribution, String toDistribution) {
+  String baseName = "v${version}-${fromDistribution}-to-${toDistribution}"
 
   Task oldClusterTest = tasks.create(name: "${baseName}#oldClusterTest", type: RestIntegTestTask) {
     mustRunAfter(precommit)
@@ -42,6 +46,7 @@ for (Version version : bwcVersions.wireCompatible) {
     numBwcNodes = 2
     numNodes = 2
     clusterName = 'rolling-upgrade'
+    distribution = fromDistribution
     setting 'repositories.url.allowed_urls', 'http://snapshot.test*'
     if (version.onOrAfter('5.3.0')) {
       setting 'http.content_type.required', 'true'
@@ -63,6 +68,7 @@ for (Version version : bwcVersions.wireCompatible) {
     /* Override the data directory so the new node always gets the node we
      * just stopped's data directory. */
     dataDir = { nodeNumber -> oldClusterTest.nodes[1].dataDir }
+    distribution = toDistribution
     setting 'repositories.url.allowed_urls', 'http://snapshot.test*'
   }
 
@@ -82,6 +88,7 @@ for (Version version : bwcVersions.wireCompatible) {
     /* Override the data directory so the new node always gets the node we
      * just stopped's data directory. */
     dataDir = { nodeNumber -> oldClusterTest.nodes[0].dataDir}
+    distribution = toDistribution
     setting 'repositories.url.allowed_urls', 'http://snapshot.test*'
   }
 
@@ -99,18 +106,28 @@ for (Version version : bwcVersions.wireCompatible) {
 
   if (project.bwc_tests_enabled) {
     bwcTest.dependsOn(versionBwcTest)
+    if (bwcVersions.snapshotsWireCompatible.contains(version)) {
+      // basic integ tests includes testing bwc against the most recent version
+      integTest.dependsOn(versionBwcTest)
+    }
   }
 }
 
-test.enabled = false // no unit tests for rolling upgrades, only the rest integration test
-
-// basic integ tests includes testing bwc against the most recent version
-task integTest {
-  if (project.bwc_tests_enabled) {
-    for (final def version : bwcVersions.snapshotsWireCompatible) {
-      dependsOn "v${version}#bwcTest"
-    }
+for (Version version : bwcVersions.wireCompatible) {
+  if (runOssUpgrades) {
+    setupBwcTests(version, 'oss-zip', 'oss-zip')
+  }
+  if (runDefaultUpgrades) {
+    /*
+     * If the source version is before xpack was opened then test upgrading
+     * from OSS to the default distribution because we expect that'll be
+     * fairly common. If it is after opening xpack then test upgrading xpack
+     * default to xpack default. zip-to-zip covers both of those cases.
+     */
+    setupBwcTests(version, 'zip', 'zip')
   }
 }
 
+test.enabled = false // no unit tests for rolling upgrades, only the rest integration test
+
 check.dependsOn(integTest)