Revert "Re-enable SplitwellUpgradeIntegrationTest (#6748)"

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/SplitwellTestUtil.scala

@@ -2,7 +2,6 @@ package org.lfdecentralizedtrust.splice.util
 
 import com.digitalasset.canton.SynchronizerAlias
 import com.digitalasset.canton.admin.api.client.data.GrpcSequencerConnection
-import com.digitalasset.canton.integration.util.MultiSynchronizerFeatureFlag
 import com.digitalasset.canton.topology.PartyId
 import org.lfdecentralizedtrust.splice.codegen.java.splice.splitwell as splitwellCodegen
 import org.lfdecentralizedtrust.splice.codegen.java.splice.wallet.payment as walletCodegen
@@ -43,13 +42,8 @@ trait SplitwellTestUtil extends TestCommon with WalletTestUtil with TimeTestUtil
     actAndCheck(
       timeUntilSuccess = 40.seconds
     )(
-      "Connect splitwell upgrade domain", {
-        participant.synchronizers.connect(splitwellUpgradeAlias, url)
-        participant.upload_dar_unless_exists(splitwellDarPath)
-        participant.synchronizers.list_connected().foreach { sync =>
-          MultiSynchronizerFeatureFlag.enable(Seq(participant), sync.synchronizerId)
-        }
-      },
+      "Connect splitwell upgrade domain",
+      participant.synchronizers.connect(splitwellUpgradeAlias, url),
     )(
       s"Wait for splitwell upgrade domain to be connected for party $ensurePartyIsOnNewDomain",
       _ => {

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/SplitwellUpgradeFrontendIntegrationTest.scala

@@ -13,7 +13,10 @@ import org.lfdecentralizedtrust.splice.util.{
   WalletTestUtil,
 }
 import SplitwellUpgradeFrontendIntegrationTest.*
+import org.scalatest.Ignore
 
+// TODO(DACH-NY/canton-network-internal#1834) Reenable once we sorted out the reassignment issues
+@Ignore
 class SplitwellUpgradeFrontendIntegrationTest
     extends FrontendIntegrationTest(aliceSplitwellFE, bobSplitwellFE)
     with FrontendLoginUtil

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/SplitwellUpgradeIntegrationTest.scala

@@ -8,12 +8,16 @@ import org.lfdecentralizedtrust.splice.console.SplitwellAppClientReference
 import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
 import SpliceTests.BracketSynchronous.*
+import com.digitalasset.canton.logging.SuppressingLogger.LogEntryOptionality
 import org.lfdecentralizedtrust.splice.util.{MultiDomainTestUtil, SplitwellTestUtil, WalletTestUtil}
 import com.digitalasset.canton.topology.{PartyId, SynchronizerId}
+import org.scalatest.Ignore
 
 import scala.concurrent.duration.DurationInt
 import scala.util.Try
 
+// TODO(#2703) Reenable or delete
+@Ignore
 class SplitwellUpgradeIntegrationTest
     extends IntegrationTest
     with MultiDomainTestUtil
@@ -57,7 +61,27 @@ class SplitwellUpgradeIntegrationTest
     def createInstalls(splitwells: SplitwellAppClientReference*) = for {
       splitwell <- splitwells
     } eventually() {
-      Try(splitwell.createInstallRequests()).toEither.valueOr(fail(_))
+      loggerFactory
+        .assertLogsUnorderedOptionalFromResult[Try[Unit]](
+          Try(splitwell.createInstallRequests()),
+          { r =>
+            if (r.isFailure) {
+              Seq(
+                (
+                  LogEntryOptionality.Required,
+                  log =>
+                    log.errorMessage should include(
+                      "Not all informee are on the specified domainID: splitwellUpgrade"
+                    ),
+                )
+              )
+            } else {
+              Seq.empty
+            }
+          },
+        )
+        .toEither
+        .valueOr(fail(_))
     }
 
     def twoInstalls(alice: PartyId, install: splitwellCodegen.SplitwellInstall.Contract)(implicit
@@ -128,6 +152,8 @@ class SplitwellUpgradeIntegrationTest
       val acceptedInvite = bobSplitwellClient.acceptInvite(invite)
       val splitwellSynchronizerId =
         aliceValidatorBackend.participantClient.synchronizers.id_of(splitwellAlias).logical
+      val splitwellUpgradeSynchronizerId =
+        aliceValidatorBackend.participantClient.synchronizers.id_of(splitwellUpgradeAlias).logical
 
       eventually() {
         val contractDomains =
@@ -149,9 +175,6 @@ class SplitwellUpgradeIntegrationTest
         connectSplitwellUpgradeDomain(aliceValidatorBackend.participantClient, alice),
         disconnectSplitwellUpgradeDomain(aliceValidatorBackend.participantClient),
       ) {
-        val splitwellUpgradeSynchronizerId =
-          aliceValidatorBackend.participantClient.synchronizers.id_of(splitwellUpgradeAlias).logical
-
         bracket(
           connectSplitwellUpgradeDomain(bobValidatorBackend.participantClient, bob),
           disconnectSplitwellUpgradeDomain(bobValidatorBackend.participantClient),