Skip to content

Commit

Permalink
Revert unwanted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
milanmajchrak committed Jan 11, 2024
1 parent 5a974ee commit ef03760
Showing 1 changed file with 28 additions and 12 deletions.
40 changes: 28 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
INSTANCE:
required: false
type: string
default: '2'
default: '5'
IMPORT:
required: false
default: true
Expand All @@ -17,11 +17,10 @@ on:
inputs:
INSTANCE:
required: true
default: '2'
default: '5'
type: choice
options:
- '*'
- '2'
- '5'
- '8'
IMPORT:
Expand All @@ -31,7 +30,7 @@ on:

jobs:
deploy:
if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '2'
if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '5'
runs-on: dspace-dep-1
timeout-minutes: 5
steps:
Expand All @@ -43,9 +42,9 @@ jobs:
pwd
touch .env.dev-5 || true
echo INSTANCE=2 >> .env.dev-5
echo INSTANCE=5 >> .env.dev-5
echo DSPACE_HOST=dev-5.pc >> .env.dev-5
echo DSPACE_VER=customer-uk >> .env.dev-5
echo DSPACE_VER=dspace-7_x >> .env.dev-5
echo DSPACE_SSL=false >> .env.dev-5
echo DOCKER_OWNER=dataquest >> .env.dev-5
echo DSPACE_UI_IMAGE=\${DOCKER_OWNER}/dspace-angular:\$DSPACE_VER >> .env.dev-5
Expand All @@ -65,14 +64,14 @@ jobs:
echo S3_ENDPOINT=CHANGE ME >> .env.dev-5
export ENVFILE=$(pwd)/.env.dev-5
./start.sh dspace-${{ env.INSTANCE }}
./start.sh dspace-5
deploy-2:
deploy-8:
if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '8'
runs-on: dspace-dep-1
timeout-minutes: 120
env:
INSTANCE: '2'
INSTANCE: '8'
ENVFILE: /opt/dspace-envs/.env.dspace.imported.dev-5
steps:
- uses: actions/checkout@v4
Expand All @@ -90,15 +89,32 @@ jobs:
import-2:
import-8:
runs-on: dspace-dep-1
if: github.event.inputs.IMPORT == 'true'
needs: deploy-2
needs: deploy-8
env:
INSTANCE: '2'
INSTANCE: '8'
ENVFILE: /opt/dspace-envs/.env.dspace.imported.dev-5
steps:
- uses: ./.github/actions/import-db
with:
INSTANCE: ${{ env.INSTANCE }}
DATADIR: /opt/dspace-data/clarin-dspace/

- name: dspace command
run: |
export DNAME=dspace$INSTANCE
docker logs -n 50 $DNAME
echo "dspace version:"
docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace version"
echo "dspace cleanup:"
docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace cleanup -v"
echo "dspace checker:"
docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace checker -v -l"
echo "dspace healthcheck:"
docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v"

0 comments on commit ef03760

Please sign in to comment.