From 0b972cc6387df73da506cc9a1933d3bfcd7dfd78 Mon Sep 17 00:00:00 2001 From: Matus Kasak Date: Thu, 18 Sep 2025 10:22:36 +0200 Subject: [PATCH] Removed duplicity and enabled playwright tests for vsb-tuo --- .github/workflows/deploy.yml | 66 ++------------------------ .github/workflows/trigger-ui-tests.yml | 2 +- 2 files changed, 5 insertions(+), 63 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a027cccabd7..80bc6612140 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -150,39 +150,10 @@ jobs: docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v" playwright-after-deploy8: - runs-on: dspace-test-1 needs: deploy-8 - timeout-minutes: 45 if: '!inputs.IMPORT' - steps: - - name: Checkout Playwright tests - uses: actions/checkout@v4 - with: - repository: dataquest-dev/dspace-ui-tests - path: dspace-ui-tests - token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }} - - - name: Checkout main repository - uses: actions/checkout@v4 - with: - path: this-repository - - - name: Copy customer config to UI tests repository for merging - run: | - cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/ - - - name: test - working-directory: dspace-ui-tests/scripts - env: - HOME_URL: https://dev-5.pc:8443/repository/ - NAME: LINDAT - run: | - ./test.sh - - - uses: mazoea/ga-maz/end@master - with: - CHOWN_DIR: ./ - if: ${{ always() }} + uses: ./.github/workflows/playwright-tests.yml + secrets: inherit rest-tests-after-deploy8: runs-on: ubuntu-latest @@ -219,39 +190,10 @@ jobs: playwright-after-import8: - runs-on: dspace-test-1 needs: import-8 if: inputs.IMPORT - timeout-minutes: 45 - steps: - - name: Checkout Playwright tests - uses: actions/checkout@v4 - with: - repository: dataquest-dev/dspace-ui-tests - path: dspace-ui-tests - token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }} - - - name: Checkout main repository - uses: actions/checkout@v4 - with: - path: this-repository - - - name: Copy customer config to UI tests repository for merging - run: | - cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/ - - - name: test - working-directory: dspace-ui-tests/scripts - env: - HOME_URL: https://dev-5.pc:8443/repository/ - NAME: LINDAT - run: | - ./test.sh - - - uses: mazoea/ga-maz/end@master - with: - CHOWN_DIR: ./ - if: ${{ always() }} + uses: ./.github/workflows/playwright-tests.yml + secrets: inherit rest-tests-after-import8: runs-on: ubuntu-latest diff --git a/.github/workflows/trigger-ui-tests.yml b/.github/workflows/trigger-ui-tests.yml index a5d6bbccb72..44c94114c62 100644 --- a/.github/workflows/trigger-ui-tests.yml +++ b/.github/workflows/trigger-ui-tests.yml @@ -24,7 +24,7 @@ jobs: git fetch --prune origin BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/') - SKIP_BRANCHES=("customer/sav" "customer/vsb-tuo") + SKIP_BRANCHES=("customer/sav") for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then