Skip to content

Commit 0b972cc

Browse files
author
Matus Kasak
committed
Removed duplicity and enabled playwright tests for vsb-tuo
1 parent 8a393e3 commit 0b972cc

2 files changed

Lines changed: 5 additions & 63 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 4 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -150,39 +150,10 @@ jobs:
150150
docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v"
151151
152152
playwright-after-deploy8:
153-
runs-on: dspace-test-1
154153
needs: deploy-8
155-
timeout-minutes: 45
156154
if: '!inputs.IMPORT'
157-
steps:
158-
- name: Checkout Playwright tests
159-
uses: actions/checkout@v4
160-
with:
161-
repository: dataquest-dev/dspace-ui-tests
162-
path: dspace-ui-tests
163-
token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
164-
165-
- name: Checkout main repository
166-
uses: actions/checkout@v4
167-
with:
168-
path: this-repository
169-
170-
- name: Copy customer config to UI tests repository for merging
171-
run: |
172-
cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/
173-
174-
- name: test
175-
working-directory: dspace-ui-tests/scripts
176-
env:
177-
HOME_URL: https://dev-5.pc:8443/repository/
178-
NAME: LINDAT
179-
run: |
180-
./test.sh
181-
182-
- uses: mazoea/ga-maz/end@master
183-
with:
184-
CHOWN_DIR: ./
185-
if: ${{ always() }}
155+
uses: ./.github/workflows/playwright-tests.yml
156+
secrets: inherit
186157

187158
rest-tests-after-deploy8:
188159
runs-on: ubuntu-latest
@@ -219,39 +190,10 @@ jobs:
219190
220191
221192
playwright-after-import8:
222-
runs-on: dspace-test-1
223193
needs: import-8
224194
if: inputs.IMPORT
225-
timeout-minutes: 45
226-
steps:
227-
- name: Checkout Playwright tests
228-
uses: actions/checkout@v4
229-
with:
230-
repository: dataquest-dev/dspace-ui-tests
231-
path: dspace-ui-tests
232-
token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
233-
234-
- name: Checkout main repository
235-
uses: actions/checkout@v4
236-
with:
237-
path: this-repository
238-
239-
- name: Copy customer config to UI tests repository for merging
240-
run: |
241-
cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/
242-
243-
- name: test
244-
working-directory: dspace-ui-tests/scripts
245-
env:
246-
HOME_URL: https://dev-5.pc:8443/repository/
247-
NAME: LINDAT
248-
run: |
249-
./test.sh
250-
251-
- uses: mazoea/ga-maz/end@master
252-
with:
253-
CHOWN_DIR: ./
254-
if: ${{ always() }}
195+
uses: ./.github/workflows/playwright-tests.yml
196+
secrets: inherit
255197

256198
rest-tests-after-import8:
257199
runs-on: ubuntu-latest

.github/workflows/trigger-ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
2525
git fetch --prune origin
2626
BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/')
27-
SKIP_BRANCHES=("customer/sav" "customer/vsb-tuo")
27+
SKIP_BRANCHES=("customer/sav")
2828
2929
for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do
3030
if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then

0 commit comments

Comments
 (0)