Fix Active/Passive functional tests (#846)

Signed-off-by: Ryan Emerson <remerson@redhat.com>
keycloak · Jun 12, 2024 · 8d5df10 · 8d5df10
1 parent f30cebc
commit 8d5df10
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/rosa-run-crossdc-func-tests.yml b/.github/workflows/rosa-run-crossdc-func-tests.yml
@@ -80,3 +80,4 @@ jobs:
         run: ./provision/rosa-cross-dc/keycloak-benchmark-crossdc-tests/run-crossdc-tests.sh
         env:
           ACTIVE_ACTIVE: ${{ inputs.activeActive }}
+          DEPLOYMENT_NAMESPACE: ${{ env.PROJECT }}
diff --git a/...hmark-crossdc-tests/src/test/java/org/keycloak/benchmark/crossdc/AbstractCrossDCTest.java b/...hmark-crossdc-tests/src/test/java/org/keycloak/benchmark/crossdc/AbstractCrossDCTest.java
@@ -53,7 +53,7 @@ public abstract class AbstractCrossDCTest {
 
     public AbstractCrossDCTest() {
         var httpClient = HttpClientUtils.newHttpClient();
-        this.activePassive = !System.getProperty("deployment.type", "").equals(ActivePassive.TAG);
+        this.activePassive = System.getProperty("deployment.type", ActivePassive.TAG).equals(ActivePassive.TAG);
         this.DC_1 = new DatacenterInfo(httpClient, 1, activePassive);
         this.DC_2 = new DatacenterInfo(httpClient, 2, activePassive);
         this.LOAD_BALANCER_KEYCLOAK = new KeycloakClient(httpClient, DC_1.getLoadbalancerURL(), activePassive);

diff --git a/...ak-benchmark-crossdc-tests/src/test/java/org/keycloak/benchmark/crossdc/FailoverTest.java b/...ak-benchmark-crossdc-tests/src/test/java/org/keycloak/benchmark/crossdc/FailoverTest.java
@@ -25,6 +25,7 @@ public class FailoverTest extends AbstractCrossDCTest {
 
     @Override
     protected void failbackLoadBalancers() throws URISyntaxException, IOException, InterruptedException {
+        super.failbackLoadBalancers();
         if (activePassive) {
             String domain = DC_1.getKeycloakServerURL().substring("https://".length());
             AWSClient.updateRoute53HealthCheckPath(domain, "/lb-check");
@@ -38,7 +39,6 @@ protected void failbackLoadBalancers() throws URISyntaxException, IOException, I
             // Assert that both sites are part of the Accelerator EndpointGroup
             waitForAcceleratorEndpointCount(2);
         }
-        super.failbackLoadBalancers();
     }
 
     @Test

diff --git a/...ark-crossdc-tests/src/test/java/org/keycloak/benchmark/crossdc/client/DatacenterInfo.java b/...ark-crossdc-tests/src/test/java/org/keycloak/benchmark/crossdc/client/DatacenterInfo.java
@@ -35,7 +35,7 @@ public DatacenterInfo(HttpClient httpClient, int index, boolean activePassive) {
             this.keycloakServerURL = "https://" + oc.routes()
                   .inNamespace(namespace)
                   .withName("aws-health-route")
-                  .item()
+                  .get()
                   .getSpec()
                   .getHost();
         } else {