[ST] Fixes to LogCollector and UserST (#11876)

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

Author: im-konge

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

@@ -156,6 +156,11 @@ public interface TestTags {
      */
     String PERFORMANCE = "performance";
 
+    /**
+     * Tag for tests focusing on users - this one is especially for UserST in order to create `test-suite-namespace`.
+     */
+    String USER = "user";
+
     /**
      * Tag for tests that covers Tiered Storage integration
      */

systemtest/src/main/java/io/strimzi/systemtest/listeners/ExecutionListener.java

@@ -68,7 +68,8 @@ public static boolean requiresSharedNamespace(final ExtensionContext extensionCo
             TestTags.DYNAMIC_CONFIGURATION, // Dynamic configuration also because in DynamicConfSharedST we use @TestFactory
             TestTags.TRACING,  // Tracing, because we deploy Jaeger operator inside additional namespace
             TestTags.KAFKA_SMOKE, // KafkaVersionsST, MigrationST because here we use @ParameterizedTest
-            TestTags.KRAFT_UPGRADE
+            TestTags.KRAFT_UPGRADE,
+            TestTags.USER // Needed for UserST mainly, where we are deploying Kafka into the `test-suite-namespace` before running all other tests
         );
 
         for (TestIdentifier testIdentifier : testCases) {

systemtest/src/main/java/io/strimzi/systemtest/logs/TestLogCollector.java

@@ -142,6 +142,7 @@ private LogCollector defaultLogCollector() {
             TestConstants.CONFIG_MAP.toLowerCase(Locale.ROOT),
             TestConstants.SERVICE.toLowerCase(Locale.ROOT),
             TestConstants.CERTIFICATE.toLowerCase(Locale.ROOT),
+            TestConstants.JOB.toLowerCase(Locale.ROOT),
             Kafka.RESOURCE_SINGULAR,
             KafkaNodePool.RESOURCE_SINGULAR,
             KafkaConnect.RESOURCE_SINGULAR,
@@ -190,21 +191,24 @@ private Path checkPathAndReturnFullRootPathWithIndexFolder(Path rootPathToLogsFo
             String[] filesInLogsDir = logsForTestCase.list();
 
             if (filesInLogsDir != null && filesInLogsDir.length > 0) {
-                index = Integer.parseInt(
-                    Arrays
-                        .stream(filesInLogsDir)
-                        .filter(file -> {
-                            try {
-                                Integer.parseInt(file);
-                                return true;
-                            } catch (NumberFormatException e) {
-                                return false;
-                            }
-                        })
-                        .sorted()
-                        .toList()
-                        .get(filesInLogsDir.length - 1)
-                ) + 1;
+                List<String> indexes = Arrays
+                    .stream(filesInLogsDir)
+                    .filter(file -> {
+                        try {
+                            Integer.parseInt(file);
+                            return true;
+                        } catch (NumberFormatException e) {
+                            return false;
+                        }
+                    })
+                    .sorted()
+                    .toList();
+
+                // check if there is actually something in the list of folders
+                if (!indexes.isEmpty()) {
+                    // take the highest index and increase it by one for a new directory
+                    index = Integer.parseInt(indexes.get(indexes.size() - 1)) + 1;
+                }
             }
         }
 

systemtest/src/test/java/io/strimzi/systemtest/operators/user/UserST.java

@@ -55,6 +55,7 @@
 
 import static io.strimzi.systemtest.TestTags.ACCEPTANCE;
 import static io.strimzi.systemtest.TestTags.REGRESSION;
+import static io.strimzi.systemtest.TestTags.USER;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -66,6 +67,7 @@
 import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath;
 
 @Tag(REGRESSION)
+@Tag(USER)
 @SuiteDoc(
     description = @Desc("Test suite for various Kafka User operations and configurations."),
     beforeTestSteps = {
@@ -506,12 +508,18 @@ void testTlsExternalUser() {
         }
         );
 
+        // Change the producer name in order to sure that we will not pick old Pod (race condition)
+        String newProducerName = testStorage.getProducerName() + "-authz";
+        kafkaClients = new KafkaClientsBuilder(kafkaClients)
+            .withProducerName(newProducerName)
+            .build();
+
         KubeResourceManager.get().createResourceWithWait(kafkaClients.producerTlsStrimzi(testStorage.getClusterName()));
 
         PodUtils.waitUntilMessageIsInPodLogs(testStorage.getNamespaceName(),
-            PodUtils.getPodNameByPrefix(testStorage.getNamespaceName(), testStorage.getProducerName()), "authorization failed");
+            PodUtils.getPodNameByPrefix(testStorage.getNamespaceName(), newProducerName), "authorization failed");
 
-        ClientUtils.waitForInstantProducerClientTimeout(testStorage);
+        ClientUtils.waitForClientTimeout(testStorage.getNamespaceName(), newProducerName, testStorage.getMessageCount());
     }
 
     @BeforeAll