chore(ci): Wait for service termination

- Try to fix flaky CI tests where user-report-system service has not been terminated before the next test starts to run
openshift-integration · Sep 5, 2023 · 4a36c66 · 4a36c66
1 parent 94e7b2e
commit 4a36c66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml
@@ -114,7 +114,8 @@ jobs:
         run: |
           # Then run integration tests
           yaks run test/consumers $YAKS_RUN_OPTIONS
-          yaks run test/user-report $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportCrime.feature $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportHealth.feature $YAKS_RUN_OPTIONS
           yaks run test/bridges $YAKS_RUN_OPTIONS
       - name: YAKS Report
         if: failure()

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -108,7 +108,8 @@ jobs:
         run: |
           # Then run integration tests
           yaks run test/consumers $YAKS_RUN_OPTIONS
-          yaks run test/user-report $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportCrime.feature $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportHealth.feature $YAKS_RUN_OPTIONS
           yaks run test/bridges $YAKS_RUN_OPTIONS
       - name: YAKS Report
         if: failure()
@@ -204,7 +205,8 @@ jobs:
         run: |
           # Then run integration tests
           yaks run test/consumers $YAKS_RUN_OPTIONS
-          yaks run test/user-report $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportCrime.feature $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportHealth.feature $YAKS_RUN_OPTIONS
           yaks run test/bridges $YAKS_RUN_OPTIONS
       - name: YAKS Report
         if: failure()

diff --git a/test/user-report/yaks-config.yaml b/test/user-report/yaks-config.yaml
@@ -31,6 +31,9 @@ pre:
     run: |
       yaks role --add strimzi
 post:
+  - name: Wait for service termination
+    run: |
+      kubectl wait --for=delete service/user-report-system --timeout=60s -n ${YAKS_NAMESPACE}
   - name: Delete secret
     run: |
       kubectl delete secret example-event-streaming-user-reporting -n ${YAKS_NAMESPACE}