Fix operator tests flakiness in CI

Apicurio · Nov 7, 2024 · b83a400 · b83a400
1 parent 76401cb
commit b83a400
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/operator/controller/src/test/java/io/apicurio/registry/operator/it/ITBase.java b/operator/controller/src/test/java/io/apicurio/registry/operator/it/ITBase.java
@@ -27,6 +27,7 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 public class ITBase {
 
@@ -142,6 +143,10 @@ private static void createCRDs() {
         try {
             var crd = client.load(new FileInputStream(CRD_FILE));
             crd.createOrReplace();
+            await().ignoreExceptions().until(() -> {
+                crd.resources().forEach(r -> assertThat(r.get()).isNotNull());
+                return true;
+            });
         } catch (Exception e) {
             Log.warn("Failed to create the CRD, retrying", e);
             createCRDs();
@@ -185,7 +190,7 @@ public void cleanup() {
         if (cleanup) {
             Log.info("Deleting CRs");
             client.resources(ApicurioRegistry3.class).delete();
-            Awaitility.await().untilAsserted(() -> {
+            await().untilAsserted(() -> {
                 var registryDeployments = client.apps().deployments().inNamespace(namespace)
                         .withLabels(Constants.BASIC_LABELS).list().getItems();
                 assertThat(registryDeployments.size()).isZero();

diff --git a/operator/controller/src/test/java/io/apicurio/registry/operator/it/KafkaSQLITTest.java b/operator/controller/src/test/java/io/apicurio/registry/operator/it/KafkaSQLITTest.java
@@ -33,7 +33,8 @@ public static void beforeAll() throws Exception {
 
     @Test
     void testKafkaSQLPlain() {
-        client.load(getClass().getResourceAsStream("/k8s/examples/kafkasql/plain/ephemeral.kafka.yaml"))
+        client.load(
+                KafkaSQLITTest.class.getResourceAsStream("/k8s/examples/kafkasql/plain/ephemeral.kafka.yaml"))
                 .create();
         final var clusterNAme = "my-cluster";
 
@@ -80,8 +81,12 @@ private static void applyStrimziResources() throws IOException {
                     var crb = (RoleBinding) r;
                     crb.getSubjects().forEach(s -> s.setNamespace(namespace));
                 }
-                log.info("Creating Strimzi in namespace {}", namespace);
+                log.info("Creating Strimzi resource kind {} in namespace {}", r.getKind(), namespace);
                 client.resource(r).inNamespace(namespace).createOrReplace();
+                await().ignoreExceptions().until(() -> {
+                    assertThat(client.resource(r).inNamespace(namespace).get()).isNotNull();
+                    return true;
+                });
             });
         }
     }