Skip to content

Commit

Permalink
[ST] Modify STs after 0.42.0 release - upgrade/downgrade/OLM versions (
Browse files Browse the repository at this point in the history
…strimzi#10326)

Signed-off-by: jkalinic <[email protected]>
  • Loading branch information
jankalinic authored and mstruk committed Jul 15, 2024
1 parent 4989d77 commit 94f93e0
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
28 changes: 14 additions & 14 deletions systemtest/src/test/resources/upgrade/BundleDowngrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions systemtest/src/test/resources/upgrade/BundleUpgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions systemtest/src/test/resources/upgrade/OlmUpgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 94f93e0

Please sign in to comment.