fixup! disable problematic tests only in github CI environment

cryostatio · Nov 8, 2023 · 3cafece · 3cafece
1 parent adf8df3
commit 3cafece
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
@@ -93,6 +93,4 @@ jobs:
       run: echo "DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock" >> "$GITHUB_ENV"
     - name: Build application
       run: ./mvnw -B -U -Dquarkus.container-image.build=false clean verify
-      env:
-        CI_ENVIRONMENT: github
       continue-on-error: ${{ matrix.java != '17' }}
diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml
@@ -101,8 +101,6 @@ jobs:
       run: echo "DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock" >> "$GITHUB_ENV"
     - name: Build application
       run: ./mvnw -B -U clean verify
-      env:
-        CI_ENVIRONMENT: github
       continue-on-error: ${{ matrix.java != '17' }}
     - name: Delete local integration test image
       run: podman rmi ${{ env.CI_IMG }}:latest ${{ env.CI_IMG }}:dev ${{ env.CI_IMG }}:${{ env.IMAGE_VERSION }}

diff --git a/src/test/java/itest/CryostatTemplateIT.java b/src/test/java/itest/CryostatTemplateIT.java
@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
-@DisabledIfEnvironmentVariable(named = "CI_ENVIRONMENT", matches = "github")
+@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
 @QuarkusIntegrationTest
 public class CryostatTemplateIT extends StandardSelfTest {
 

diff --git a/src/test/java/itest/RulesPostJsonIT.java b/src/test/java/itest/RulesPostJsonIT.java
@@ -108,8 +108,8 @@ void testAddRuleThrowsWhenMimeUnsupported() throws Exception {
     }
 
     @DisabledIfEnvironmentVariable(
-            named = "CI_ENVIRONMENT",
-            matches = "github",
+            named = "CI",
+            matches = "true",
             disabledReason =
                     "The server 500 seems to cause issues for the next test in the suite, ex. HTTP"
                             + " connection closed when attempting to POST the next rule definition")