Skip to content

Commit ba19c25

Browse files
author
Matus Kasak
committed
Uncommented playwright and deploy - not testing
1 parent b6b5fd1 commit ba19c25

File tree

1 file changed

+33
-34
lines changed

1 file changed

+33
-34
lines changed

.github/workflows/deploy.yml

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -80,33 +80,33 @@ jobs:
8080
steps:
8181
- uses: actions/checkout@v4
8282

83-
# - uses: ./.github/actions/erase-db
84-
# if: inputs.ERASE_DB
85-
# with:
86-
# INSTANCE: ${{ env.INSTANCE }}
87-
# NAME: dspace-${{ env.INSTANCE }}
88-
89-
# - name: deploy dspace-import on dev-5
90-
# working-directory: build-scripts/run/
91-
# run: |
92-
# ./start.sh dspace-$INSTANCE
93-
# cd ../..
94-
# # this is not necessary, since extra.yml doesn't contain any new images that weren't pulled within script above
95-
# # docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f /opt/dspace-envs/8/extra.yml pull
96-
# docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f /opt/dspace-envs/8/extra.yml up -d --no-build
97-
98-
# # this must be here and not in the start.sh, because extra.yml replaces dspace container
99-
# ## !!!!! please remove this section if you do not want handle server !!!!!!!
100-
# echo "====="
101-
# echo "installing handle server"
102-
# docker exec dspace${INSTANCE} /dspace/bin/make-handle-config
103-
# echo "made handle config:"
104-
# docker exec dspace${INSTANCE} cat /dspace/handle-server/config.dct
105-
# docker exec dspace${INSTANCE} /dspace/bin/start-handle-server
106-
# echo "started handle server"
107-
# # this seems to be the easiest solution for now
108-
# docker restart dockerized-nginx-with-shibboleth-nginx-1
109-
# /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://dev-5.pc:8$INSTANCE/repository/server/api)" != "200" ]]; do sleep 5; done'
83+
- uses: ./.github/actions/erase-db
84+
if: inputs.ERASE_DB
85+
with:
86+
INSTANCE: ${{ env.INSTANCE }}
87+
NAME: dspace-${{ env.INSTANCE }}
88+
89+
- name: deploy dspace-import on dev-5
90+
working-directory: build-scripts/run/
91+
run: |
92+
./start.sh dspace-$INSTANCE
93+
cd ../..
94+
# this is not necessary, since extra.yml doesn't contain any new images that weren't pulled within script above
95+
# docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f /opt/dspace-envs/8/extra.yml pull
96+
docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f /opt/dspace-envs/8/extra.yml up -d --no-build
97+
98+
# this must be here and not in the start.sh, because extra.yml replaces dspace container
99+
## !!!!! please remove this section if you do not want handle server !!!!!!!
100+
echo "====="
101+
echo "installing handle server"
102+
docker exec dspace${INSTANCE} /dspace/bin/make-handle-config
103+
echo "made handle config:"
104+
docker exec dspace${INSTANCE} cat /dspace/handle-server/config.dct
105+
docker exec dspace${INSTANCE} /dspace/bin/start-handle-server
106+
echo "started handle server"
107+
# this seems to be the easiest solution for now
108+
docker restart dockerized-nginx-with-shibboleth-nginx-1
109+
/bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://dev-5.pc:8$INSTANCE/repository/server/api)" != "200" ]]; do sleep 5; done'
110110
111111
112112
import-5:
@@ -193,16 +193,15 @@ jobs:
193193
echo "dspace healthcheck:"
194194
docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v"
195195
196-
# playwright-after-deploy8:
197-
# needs: deploy-8
198-
# if: '!inputs.IMPORT'
199-
# uses: ./.github/workflows/playwright-tests.yml
200-
# secrets: inherit
196+
playwright-after-deploy8:
197+
needs: deploy-8
198+
if: '!inputs.IMPORT'
199+
uses: ./.github/workflows/playwright-tests.yml
200+
secrets: inherit
201201

202202
rest-tests-after-deploy8:
203203
runs-on: ubuntu-latest
204-
# needs: playwright-after-deploy8
205-
needs: deploy-8
204+
needs: playwright-after-deploy8
206205
if: '!inputs.IMPORT'
207206
timeout-minutes: 120
208207
env:

0 commit comments

Comments
 (0)