[ST] Update upgrade/downgrade YAMLs and Environment class after 0.40.…

…0 release (#9818)

Signed-off-by: Lukas Kral <[email protected]>

systemtest/src/main/java/io/strimzi/systemtest/Environment.java

@@ -203,7 +203,7 @@ public class Environment {
     private static final String ST_CLIENTS_KAFKA_VERSION_DEFAULT = "3.7.0";
     public static final String TEST_CLIENTS_VERSION_DEFAULT = "0.7.0";
     public static final String ST_FILE_PLUGIN_URL_DEFAULT = "https://repo1.maven.org/maven2/org/apache/kafka/connect-file/" + ST_KAFKA_VERSION_DEFAULT + "/connect-file-" + ST_KAFKA_VERSION_DEFAULT + ".jar";
-    public static final String OLM_OPERATOR_VERSION_DEFAULT = "0.38.0";
+    public static final String OLM_OPERATOR_VERSION_DEFAULT = "0.40.0";
 
     public static final String IP_FAMILY_DEFAULT = "ipv4";
     public static final String IP_FAMILY_VERSION_6 = "ipv6";

systemtest/src/test/resources/upgrade/BundleDowngrade.yaml

@@ -31,19 +31,19 @@
 # --- Structure ---
 
 - fromVersion: HEAD
-  toVersion: 0.39.0
+  toVersion: 0.40.0
   fromExamples: HEAD
-  toExamples: strimzi-0.39.0
+  toExamples: strimzi-0.40.0
   fromUrl: HEAD
-  toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
+  toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.40.0/strimzi-0.40.0.zip
   fromKafkaVersionsUrl: HEAD
   additionalTopics: 2
   imagesAfterOperations:
-    zookeeper: strimzi/kafka:0.39.0-kafka-3.6.0
-    kafka: strimzi/kafka:0.39.0-kafka-3.6.0
-    topicOperator: strimzi/operator:0.39.0
-    userOperator: strimzi/operator:0.39.0
-  deployKafkaVersion: 3.6.1
+    zookeeper: strimzi/kafka:0.40.0-kafka-3.6.0
+    kafka: strimzi/kafka:0.40.0-kafka-3.6.0
+    topicOperator: strimzi/operator:0.40.0
+    userOperator: strimzi/operator:0.40.0
+  deployKafkaVersion: 3.7.0
   client:
     continuousClientsMessages: 500
   environmentInfo:
@@ -57,21 +57,21 @@
     kafkaBefore: "/examples/kafka/kafka-persistent.yaml"
     kafkaAfter: "/examples/kafka/kafka-persistent.yaml"
     kafkaKRaftBefore: "/examples/kafka/kraft/kafka.yaml"
-    kafkaKRaftAfter: "/examples/kafka/nodepools/kafka-with-kraft.yaml"
+    kafkaKRaftAfter: "/examples/kafka/kraft/kafka.yaml"
 - fromVersion: HEAD
-  toVersion: 0.39.0
+  toVersion: 0.40.0
   fromExamples: HEAD
-  toExamples: strimzi-0.39.0
+  toExamples: strimzi-0.40.0
   fromUrl: HEAD
-  toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
+  toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.40.0/strimzi-0.40.0.zip
   fromKafkaVersionsUrl: HEAD
   additionalTopics: 2
   imagesAfterOperations:
-    zookeeper: strimzi/kafka:0.39.0-kafka-3.6.0
-    kafka: strimzi/kafka:0.39.0-kafka-3.6.0
-    topicOperator: strimzi/operator:0.39.0
-    userOperator: strimzi/operator:0.39.0
-  deployKafkaVersion: 3.6.1
+    zookeeper: strimzi/kafka:0.40.0-kafka-3.6.0
+    kafka: strimzi/kafka:0.40.0-kafka-3.6.0
+    topicOperator: strimzi/operator:0.40.0
+    userOperator: strimzi/operator:0.40.0
+  deployKafkaVersion: 3.7.0
   client:
     continuousClientsMessages: 500
   environmentInfo:
@@ -85,4 +85,4 @@
     kafkaBefore: "/examples/kafka/kafka-persistent.yaml"
     kafkaAfter: "/examples/kafka/kafka-persistent.yaml"
     kafkaKRaftBefore: "/examples/kafka/kraft/kafka.yaml"
-    kafkaKRaftAfter: "/examples/kafka/nodepools/kafka-with-kraft.yaml"
+    kafkaKRaftAfter: "/examples/kafka/kraft/kafka.yaml"

systemtest/src/test/resources/upgrade/BundleUpgrade.yaml

@@ -29,11 +29,11 @@
 #    kafkaKRaftAfter: path to Kafka and KafkaNodePool resources (KRaft mode), collected in one file, in the version of Strimzi, to which we are doing the upgrade
 #  --- Structure ---
 
-- fromVersion: 0.39.0
-  fromExamples: strimzi-0.39.0
+- fromVersion: 0.40.0
+  fromExamples: strimzi-0.40.0
   oldestKafka: 3.6.0
-  fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
-  fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.39.0/kafka-versions.yaml
+  fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.40.0/strimzi-0.40.0.zip
+  fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.40.0/kafka-versions.yaml
   additionalTopics: 2
   imagesAfterOperations:
     zookeeper: strimzi/kafka:latest-kafka-3.7.0
@@ -52,13 +52,13 @@
   filePaths:
     kafkaBefore: "/examples/kafka/kafka-persistent.yaml"
     kafkaAfter: "/examples/kafka/kafka-persistent.yaml"
-    kafkaKRaftBefore: "/examples/kafka/nodepools/kafka-with-kraft.yaml"
+    kafkaKRaftBefore: "/examples/kafka/kraft/kafka.yaml"
     kafkaKRaftAfter: "/examples/kafka/kraft/kafka.yaml"
-- fromVersion: 0.39.0
-  fromExamples: strimzi-0.39.0
+- fromVersion: 0.40.0
+  fromExamples: strimzi-0.40.0
   oldestKafka: 3.6.0
-  fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
-  fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.39.0/kafka-versions.yaml
+  fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.40.0/strimzi-0.40.0.zip
+  fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.40.0/kafka-versions.yaml
   additionalTopics: 2
   imagesAfterOperations:
     zookeeper: strimzi/kafka:latest-kafka-3.7.0
@@ -77,5 +77,5 @@
   filePaths:
     kafkaBefore: "/examples/kafka/kafka-persistent.yaml"
     kafkaAfter: "/examples/kafka/kafka-persistent.yaml"
-    kafkaKRaftBefore: "/examples/kafka/nodepools/kafka-with-kraft.yaml"
+    kafkaKRaftBefore: "/examples/kafka/kraft/kafka.yaml"
     kafkaKRaftAfter: "/examples/kafka/kraft/kafka.yaml"

systemtest/src/test/resources/upgrade/OlmUpgrade.yaml

@@ -18,11 +18,11 @@
 #  Kubernetes cluster.
 #  --- Prerequisites ---
 
-fromVersion: 0.39.0
-fromOlmChannelName: strimzi-0.39.x
-fromExamples: strimzi-0.39.0
-fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.39.0/strimzi-0.39.0.zip
-fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.39.0/kafka-versions.yaml
+fromVersion: 0.40.0
+fromOlmChannelName: strimzi-0.40.x
+fromExamples: strimzi-0.40.0
+fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.40.0/strimzi-0.40.0.zip
+fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.40.0/kafka-versions.yaml
 filePaths:
   kafkaBefore: "/examples/kafka/kafka-persistent.yaml"
   kafkaAfter: "/examples/kafka/kafka-persistent.yaml"