Port fix to ccs-rolling-upgrade-remote-cluster (#82895)

grcevski · web-flow · commit df44d1305ace · 2022-01-20T17:15:20.000-05:00
diff --git a/qa/ccs-rolling-upgrade-remote-cluster/build.gradle b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle
@@ -53,11 +53,17 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
     }
   }
 
-  tasks.register("${baseName}#oneThirdUpgraded", StandaloneRestIntegTestTask) {
+  tasks.register("${baseName}#oldClusterTest", StandaloneRestIntegTestTask) {
     dependsOn "processTestResources"
     mustRunAfter("precommit")
     doFirst {
       localCluster.get().nextNodeToNextVersion()
+    }
+  }
+
+  tasks.register("${baseName}#oneThirdUpgraded", StandaloneRestIntegTestTask) {
+    dependsOn "${baseName}#oldClusterTest"
+    doFirst {
       remoteCluster.get().nextNodeToNextVersion()
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,17 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- tasks.register("${baseName}#oneThirdUpgraded", StandaloneRestIntegTestTask) {`
	`56`	`+ tasks.register("${baseName}#oldClusterTest", StandaloneRestIntegTestTask) {`
`57`	`57`	`dependsOn "processTestResources"`
`58`	`58`	`mustRunAfter("precommit")`
`59`	`59`	`doFirst {`
`60`	`60`	`localCluster.get().nextNodeToNextVersion()`
	`61`	`+ }`
	`62`	`+ }`
	`63`	`+`
	`64`	`+ tasks.register("${baseName}#oneThirdUpgraded", StandaloneRestIntegTestTask) {`
	`65`	`+ dependsOn "${baseName}#oldClusterTest"`
	`66`	`+ doFirst {`
`61`	`67`	`remoteCluster.get().nextNodeToNextVersion()`
`62`	`68`	`}`
`63`	`69`	`}`