Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 6 additions & 34 deletions .github/workflows/deploy-Dataspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,6 @@ jobs:
with:
suite: functional
api_base_url: https://dev.api.civicdataspace.in
# Provider functional is flaky against dev, so it runs report-only in
# provider-functional-report instead of gating the deploy.
skip_provider: true
secrets:
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
TEST_EMAIL_1: ${{ secrets.TEST_EMAIL_1 }}
Expand All @@ -225,37 +222,13 @@ jobs:
TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}

provider-functional-report:
name: Provider Functional (report-only)
needs: smoke-tests
# Report-only: promote and rollback do not list this job in needs, so its
# result never rolls back or blocks a dev deploy. Promote it to a gate
# once the provider suite is stable against dev.
if: github.ref_name != 'main'
uses: CivicDataLab/CivicDataSpace-test/.github/workflows/run-smoke.yml@CI
with:
suite: functional
only_provider: true
api_base_url: https://dev.api.civicdataspace.in
secrets:
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
TEST_EMAIL_1: ${{ secrets.TEST_EMAIL_1 }}
TEST_PASSWORD_1: ${{ secrets.TEST_PASSWORD_1 }}
TEST_EMAIL_2: ${{ secrets.TEST_EMAIL_2 }}
TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}
# org_add_permission needs a token to check canAdd; without this every
# org-create test skips on both workers and the report is hollow.
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}

# Only once the tests pass does this release become the thing a future
# rollback would target -- on prod too, which used to be marked
# last-known-good straight after deploy with no tests at all.
promote:
# provider-functional-report is listed so this waits for every test to
# finish, but its result is deliberately not checked (report-only).
needs: [build-and-deploy, smoke-tests, functional-tests, provider-functional-report]
# Explicit gating results, not success()/!failure(): on main the functional
# jobs are skipped by design, and the provider job must not block.
needs: [build-and-deploy, smoke-tests, functional-tests]
# Explicit results, not success()/!failure(): on main the functional stage
# is skipped by design.
if: >-
${{ !cancelled() && needs.build-and-deploy.result == 'success' &&
needs.smoke-tests.result == 'success' &&
Expand All @@ -275,10 +248,9 @@ jobs:
script: echo "${{ needs.build-and-deploy.outputs.release }}" > /home/ubuntu/DataExchange/releases/.last_good

rollback:
# Waits for the report-only provider job too, without checking its result.
needs: [build-and-deploy, smoke-tests, functional-tests, provider-functional-report]
# Explicit gating results, not failure(): failure() would also count the
# report-only provider job.
needs: [build-and-deploy, smoke-tests, functional-tests]
# Explicit results rather than failure(), so that a skipped functional stage
# on main never reads as a failure.
if: >-
${{ !cancelled() && needs.build-and-deploy.result == 'success' &&
(needs.smoke-tests.result == 'failure' || needs.functional-tests.result == 'failure') }}
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/pr-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ jobs:
uses: CivicDataLab/CivicDataSpace-test/.github/workflows/run-smoke.yml@CI
with:
suite: full
# Provider is flaky against dev: it reports in provider-report below, which
# branch protection does not require.
skip_provider: true
api_base_url: https://dev.api.civicdataspace.in
secrets:
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
Expand All @@ -28,20 +25,3 @@ jobs:
TEST_EMAIL_2: ${{ secrets.TEST_EMAIL_2 }}
TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}

provider-report:
name: Provider Full Suite (report-only)
uses: CivicDataLab/CivicDataSpace-test/.github/workflows/run-smoke.yml@CI
with:
suite: full
only_provider: true
api_base_url: https://dev.api.civicdataspace.in
secrets:
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
TEST_EMAIL_1: ${{ secrets.TEST_EMAIL_1 }}
TEST_PASSWORD_1: ${{ secrets.TEST_PASSWORD_1 }}
TEST_EMAIL_2: ${{ secrets.TEST_EMAIL_2 }}
TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}
# org_add_permission needs a token to check canAdd; without this every
# org-create test skips on both workers and the report is hollow.
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
Loading