From 83948e4c85a1112b3af82dedb3d5a25e255787bb Mon Sep 17 00:00:00 2001 From: Christoph Deppisch Date: Tue, 5 Sep 2023 10:45:08 +0200 Subject: [PATCH] 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 --- .github/workflows/kubernetes.yml | 3 ++- .github/workflows/nightly.yml | 6 ++++-- test/user-report/yaks-config.yaml | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml index c3cbbb7..ce05fb4 100644 --- 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 index 19d6161..08bcbd9 100644 --- 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() @@ -205,7 +206,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 index 3785d15..55cd149 100644 --- 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}