[systemtest][upgrade] Attempt to deflake the upgrade tests and fix sending/receiving messages during upgrade

[im-konge]

Signed-off-by: Lukas Kral lukywill16@gmail.com

Type of change

• Bugfix

Description

In #3200 I totally forgot that the change of --broker-list to --boostrap-server can affect older versions of Kafka (during the upgrade) -> I tested it only with Kafka 2.5.0 and 2.6.0, problem is that --boostrap-server option was added to 2.5.0. So I added ternary operator to determine which option use based on Kafka version.

Also this is an attempt to deflake the upgrade tests. I assume that main problem of the flakyness was this block of code:

if (KafkaTopicResource.kafkaTopicClient().inNamespace(NAMESPACE).withName(continuousTopicName).get() == null) {
                KafkaTopicResource.topic(CLUSTER_NAME, continuousTopicName, 3, 3, 2).done();
                // Add continuous topic to expectedTopicCount which will be check after upgrade procedures
                expectedTopicCount += 1;
            }

The problem is that if happen that topic is deleted and recreated, the expectedTopicCount will be increased and next check will not pass. This assumption is based on given result from PR run:

[WARNING] Flakes: 
[WARNING] io.strimzi.systemtest.upgrade.StrimziUpgradeST.testUpgradeStrimziVersion(JsonObject)[9]
[ERROR]   Run 1: StrimziUpgradeST.testUpgradeStrimziVersion:97->performUpgrade:351 KafkaTopic list doesn't have expected size
Expected: is <44>
     but: was <43>
[INFO]   Run 2: PASS

Checklist

• Make sure all tests pass

[im-konge]

@strimzi-ci run tests test_only profile=upgrade

[strimzi-ci]

❗ Systemtests Failed (no tests results are present) ❗

[im-konge]

@strimzi-ci run tests test_only profile=upgrade

[Frawless]

/azp run upgrade

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[strimzi-ci]

✔️ Test Summary ✔️

TEST_PROFILE: upgrade
EXCLUDED_GROUPS: networkpolicies,flaky
TEST_CASE: *ST
TOTAL: 13
PASS: 12
FAIL: 0
SKIP: 1
BUILD_NUMBER: 1452
BUILD_ENV: oc cluster up

[Frawless]

/azp run upgrade

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[Frawless]

/azp run upgrade

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[im-konge]

After discussion with @Frawless I'm gonna fix the azure pipelines for upgrade in next PR -> so this can be merge and all issues fixed.