[ST] Fix StrimziUpgradeST.testUpgradeAcrossVersionsWithUnsupportedKafkaVersion test to run only when there is really an unsupported Kafka version across versions

systemtest/src/main/java/io/strimzi/systemtest/upgrade/UpgradeKafkaVersion.java

@@ -6,6 +6,10 @@
 
 import io.strimzi.systemtest.utils.TestKafkaVersion;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Class for representing Kafka version, with LMFV and IBPV for our upgrade/downgrade tests
  * Represents "procedures" which should be done after upgrade of operator/before downgrade of operator
@@ -96,4 +100,31 @@ public static UpgradeKafkaVersion getKafkaWithVersionFromUrl(String kafkaVersion
             }
         }
     }
+
+    public static Optional<UpgradeKafkaVersion> getKafkaVersionSupportedBeforeUnsupportedAfterUpgrade(String fromKafkaVersionsUrl) {
+        List<TestKafkaVersion> supportedKafkaVersionsBeforeUpgrade = getSupportedKafkaVersions(fromKafkaVersionsUrl);
+        List<String> supportedKafkaVersionsAfterUpgrade = getSupportedKafkaVersions("HEAD")
+                .stream()
+                .map(TestKafkaVersion::version)
+                .collect(Collectors.toList());
+
+        return supportedKafkaVersionsBeforeUpgrade
+                .stream()
+                .filter(version -> !supportedKafkaVersionsAfterUpgrade.contains(version.version()))
+                .map(UpgradeKafkaVersion::new)
+                .findFirst();
+    }
+
+    private static List<TestKafkaVersion> getSupportedKafkaVersions(String kafkaVersionsUrl) {
+        if (kafkaVersionsUrl.equals("HEAD")) {
+            return TestKafkaVersion.getSupportedKafkaVersions();
+        } else {
+            try {
+                List<TestKafkaVersion> kafkaVersions = TestKafkaVersion.parseKafkaVersionsFromUrl(kafkaVersionsUrl);
+                return TestKafkaVersion.getSupportedKafkaVersionsFromAllVersions(kafkaVersions);
+            } catch (Exception e) {
+                throw new RuntimeException(e.getMessage());
+            }
+        }
+    }
 }

systemtest/src/main/java/io/strimzi/systemtest/utils/TestKafkaVersion.java

@@ -29,11 +29,11 @@ public class TestKafkaVersion implements Comparable<TestKafkaVersion> {
     static {
         try {
             kafkaVersions = parseKafkaVersions(TestUtils.USER_PATH + "/../kafka-versions.yaml");
-            supportedKafkaVersions = kafkaVersions.stream().filter(TestKafkaVersion::isSupported).collect(Collectors.toList());
+            supportedKafkaVersions = getSupportedKafkaVersionsFromAllVersions(kafkaVersions);
             Collections.sort(kafkaVersions);
             Collections.sort(supportedKafkaVersions);
 
-            if (supportedKafkaVersions == null || supportedKafkaVersions.size() == 0) {
+            if (supportedKafkaVersions.isEmpty()) {
                 throw new Exception("There is no one Kafka version supported inside " + TestUtils.USER_PATH + "/../kafka-versions.yaml file");
             }
 
@@ -181,6 +181,10 @@ public static List<TestKafkaVersion> getSupportedKafkaVersions() {
         return supportedKafkaVersions;
     }
 
+    public static List<TestKafkaVersion> getSupportedKafkaVersionsFromAllVersions(List<TestKafkaVersion> kafkaVersions) {
+        return kafkaVersions.stream().filter(TestKafkaVersion::isSupported).collect(Collectors.toList());
+    }
+
     /**
      * Parse the version information present in the {@code /kafka-versions} classpath resource and return a map
      * of kafka versions data with a version as key

systemtest/src/test/java/io/strimzi/systemtest/upgrade/regular/StrimziUpgradeST.java

@@ -31,6 +31,7 @@
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
 
 import static io.strimzi.systemtest.Environment.TEST_SUITE_NAMESPACE;
 import static io.strimzi.systemtest.TestConstants.CO_NAMESPACE;
@@ -110,10 +111,11 @@ void testUpgradeKafkaWithoutVersion() throws IOException {
     @IsolatedTest
     void testUpgradeAcrossVersionsWithUnsupportedKafkaVersion() throws IOException {
         final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());
-        UpgradeKafkaVersion upgradeKafkaVersion = UpgradeKafkaVersion.getKafkaWithVersionFromUrl(acrossUpgradeData.getFromKafkaVersionsUrl(), acrossUpgradeData.getStartingKafkaVersion());
+        Optional<UpgradeKafkaVersion> upgradeKafkaVersion = UpgradeKafkaVersion.getKafkaVersionSupportedBeforeUnsupportedAfterUpgrade(acrossUpgradeData.getFromKafkaVersionsUrl());
+        assumeTrue(upgradeKafkaVersion.isPresent(), "Supported Kafka versions after upgrade contains all supported Kafka versions before upgrade so test is skipped");
 
         // Setup env
-        setupEnvAndUpgradeClusterOperator(CO_NAMESPACE, testStorage, acrossUpgradeData, upgradeKafkaVersion);
+        setupEnvAndUpgradeClusterOperator(CO_NAMESPACE, testStorage, acrossUpgradeData, upgradeKafkaVersion.get());
 
         // Make snapshots of all Pods
         makeComponentsSnapshots(TEST_SUITE_NAMESPACE);