From 2018564848ca7e4442b2bd4d6f97029b406251ea Mon Sep 17 00:00:00 2001 From: jkalinic Date: Wed, 10 Jul 2024 20:08:28 +0200 Subject: [PATCH] Bump strimzi version for upgrade STs Signed-off-by: jkalinic --- .../io/strimzi/systemtest/Environment.java | 2 +- .../resources/upgrade/BundleDowngrade.yaml | 28 +++++++++---------- .../test/resources/upgrade/BundleUpgrade.yaml | 16 +++++------ .../test/resources/upgrade/OlmUpgrade.yaml | 10 +++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/systemtest/src/main/java/io/strimzi/systemtest/Environment.java b/systemtest/src/main/java/io/strimzi/systemtest/Environment.java index 55213e216c..caceb9eb9b 100644 --- a/systemtest/src/main/java/io/strimzi/systemtest/Environment.java +++ b/systemtest/src/main/java/io/strimzi/systemtest/Environment.java @@ -211,7 +211,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.8.1"; 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.41.0"; + public static final String OLM_OPERATOR_VERSION_DEFAULT = "0.42.0"; public static final String IP_FAMILY_DEFAULT = "ipv4"; public static final String IP_FAMILY_VERSION_6 = "ipv6"; diff --git a/systemtest/src/test/resources/upgrade/BundleDowngrade.yaml b/systemtest/src/test/resources/upgrade/BundleDowngrade.yaml index 7b616b7f9d..8c69974650 100644 --- a/systemtest/src/test/resources/upgrade/BundleDowngrade.yaml +++ b/systemtest/src/test/resources/upgrade/BundleDowngrade.yaml @@ -30,18 +30,18 @@ # kafkaKRaftAfter: path to Kafka and KafkaNodePool resources (KRaft mode), collected in one file, in the version of Strimzi, to which we are doing the downgrade # --- Structure --- - fromVersion: HEAD - toVersion: 0.41.0 + toVersion: 0.42.0 fromExamples: HEAD - toExamples: strimzi-0.41.0 + toExamples: strimzi-0.42.0 fromUrl: HEAD - toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.41.0/strimzi-0.41.0.zip + toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.42.0/strimzi-0.42.0.zip fromKafkaVersionsUrl: HEAD additionalTopics: 2 imagesAfterOperations: - zookeeper: strimzi/kafka:0.41.0-kafka-3.6.0 - kafka: strimzi/kafka:0.41.0-kafka-3.6.0 - topicOperator: strimzi/operator:0.41.0 - userOperator: strimzi/operator:0.41.0 + zookeeper: strimzi/kafka:0.42.0-kafka-3.6.0 + kafka: strimzi/kafka:0.42.0-kafka-3.6.0 + topicOperator: strimzi/operator:0.42.0 + userOperator: strimzi/operator:0.42.0 deployKafkaVersion: 3.7.0 client: continuousClientsMessages: 500 @@ -58,18 +58,18 @@ kafkaKRaftBefore: "/examples/kafka/kraft/kafka.yaml" kafkaKRaftAfter: "/examples/kafka/kraft/kafka.yaml" - fromVersion: HEAD - toVersion: 0.41.0 + toVersion: 0.42.0 fromExamples: HEAD - toExamples: strimzi-0.41.0 + toExamples: strimzi-0.42.0 fromUrl: HEAD - toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.41.0/strimzi-0.41.0.zip + toUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.42.0/strimzi-0.42.0.zip fromKafkaVersionsUrl: HEAD additionalTopics: 2 imagesAfterOperations: - zookeeper: strimzi/kafka:0.41.0-kafka-3.6.0 - kafka: strimzi/kafka:0.41.0-kafka-3.6.0 - topicOperator: strimzi/operator:0.41.0 - userOperator: strimzi/operator:0.41.0 + zookeeper: strimzi/kafka:0.42.0-kafka-3.6.0 + kafka: strimzi/kafka:0.42.0-kafka-3.6.0 + topicOperator: strimzi/operator:0.42.0 + userOperator: strimzi/operator:0.42.0 deployKafkaVersion: 3.7.0 client: continuousClientsMessages: 500 diff --git a/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml b/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml index 104ec9da91..a30291a394 100644 --- a/systemtest/src/test/resources/upgrade/BundleUpgrade.yaml +++ b/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.41.0 - fromExamples: strimzi-0.41.0 +- fromVersion: 0.42.0 + fromExamples: strimzi-0.42.0 oldestKafka: 3.6.0 - fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.41.0/strimzi-0.41.0.zip - fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.41.0/kafka-versions.yaml + fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.42.0/strimzi-0.42.0.zip + fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.42.0/kafka-versions.yaml additionalTopics: 2 imagesAfterOperations: zookeeper: strimzi/kafka:latest-kafka-3.7.1 @@ -54,11 +54,11 @@ kafkaAfter: "/examples/kafka/kafka-persistent.yaml" kafkaKRaftBefore: "/examples/kafka/kraft/kafka.yaml" kafkaKRaftAfter: "/examples/kafka/kraft/kafka.yaml" -- fromVersion: 0.41.0 - fromExamples: strimzi-0.41.0 +- fromVersion: 0.42.0 + fromExamples: strimzi-0.42.0 oldestKafka: 3.6.0 - fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.41.0/strimzi-0.41.0.zip - fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.41.0/kafka-versions.yaml + fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.42.0/strimzi-0.42.0.zip + fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.42.0/kafka-versions.yaml additionalTopics: 2 imagesAfterOperations: zookeeper: strimzi/kafka:latest-kafka-3.7.1 diff --git a/systemtest/src/test/resources/upgrade/OlmUpgrade.yaml b/systemtest/src/test/resources/upgrade/OlmUpgrade.yaml index fbc13e3c91..0e06988913 100644 --- a/systemtest/src/test/resources/upgrade/OlmUpgrade.yaml +++ b/systemtest/src/test/resources/upgrade/OlmUpgrade.yaml @@ -18,11 +18,11 @@ # Kubernetes cluster. # --- Prerequisites --- -fromVersion: 0.41.0 -fromOlmChannelName: strimzi-0.41.x -fromExamples: strimzi-0.41.0 -fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.41.0/strimzi-0.41.0.zip -fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.41.0/kafka-versions.yaml +fromVersion: 0.42.0 +fromOlmChannelName: strimzi-0.42.x +fromExamples: strimzi-0.42.0 +fromUrl: https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.42.0/strimzi-0.42.0.zip +fromKafkaVersionsUrl: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/0.42.0/kafka-versions.yaml filePaths: kafkaBefore: "/examples/kafka/kafka-persistent.yaml" kafkaAfter: "/examples/kafka/kafka-persistent.yaml"