Merge branch 'customer/vsb-tuo' of github.com:dataquest-dev/dspace-angular into customer/vsb-tuo

Author: milanmajchrak

.github/workflows/deploy.yml

@@ -4,10 +4,14 @@ name: Deploy DSpace
 on:
   workflow_call:
     inputs:
+      DEV_MACHINE:
+        required: false
+        type: string
+        default: 'dev-6'
       INSTANCE:
         required: false
         type: string
-        default: '5'
+        default: '8563'
       IMPORT:
         required: false
         default: true
@@ -21,12 +25,10 @@ on:
     inputs:
       INSTANCE:
         required: true
-        default: '5'
+        default: '8563'
         type: choice
         options:
-          - '*'
-          - '5'
-          - '8'
+          - '8563'
       IMPORT:
         required: true
         default: true
@@ -35,15 +37,20 @@ on:
         required: false
         default: false
         type: boolean
+      DEV_MACHINE:
+        required: false
+        type: string
+        default: 'dev-6'
 
 jobs:
-  deploy-5:
-    if: inputs.INSTANCE == '*' || inputs.INSTANCE == '5'
-    runs-on: dspace-dep-1
+  deploy-3:
+    if: inputs.INSTANCE == '*' || inputs.INSTANCE == '8563'
+    runs-on: dspace-${{inputs.DEV_MACHINE}}-dep-1
     timeout-minutes: 10
     env:
-      INSTANCE: '5'
-      ENVFILE: /opt/dspace-envs/.env.dspace.dev-5
+      INSTANCE: '8563'
+      CONFIG_PATH: /opt/dspace-envs/${{inputs.INSTANCE}}
+      ENVFILE: /opt/dspace-envs/${{inputs.INSTANCE}}/.env
     steps:
       - uses: actions/checkout@v4
 
@@ -53,235 +60,52 @@ jobs:
           INSTANCE: ${{ env.INSTANCE }}
           NAME: dspace-${{ env.INSTANCE }}
 
-      - name: deploy to dev-5
+      - name: deploy to ${{inputs.DEV_MACHINE}}
         working-directory: build-scripts/run/
         run: |
           ./start.sh dspace-$INSTANCE
           cd ../..
           # use customized docker-compose file for the `85` port because the server is exposed with the namespace `repository`
           # `/repository/server`
-          docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f /opt/dspace-envs/5/docker-compose-rest.yml -f /opt/dspace-envs/5/docker-compose.yml up -d --no-build
+          docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose.yml up -d --no-build
 
-  deploy-8:
-    if: inputs.INSTANCE == '*' || inputs.INSTANCE == '8'
-    runs-on: dspace-dep-1
+  import-3:
+    runs-on: dspace-${{inputs.DEV_MACHINE}}-dep-1
+    if: inputs.IMPORT
     timeout-minutes: 120
+    needs: deploy-3
     env:
-      INSTANCE: '8'
-      # 2024/02: this .env replaces ENTRYPOINT to angular
-      # !!!!WARNING!!!!
-      # disable TSL checks = allowing to cooperate with https backend with invalid
-      # certificate
-      ENVFILE: /opt/dspace-envs/.env.dspace.imported.dev-5
+      INSTANCE: ${{inputs.INSTANCE}}
+      CONFIG_PATH: /opt/dspace-envs/
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: ./.github/actions/erase-db
-        if: inputs.ERASE_DB
-        with:
-          INSTANCE: ${{ env.INSTANCE }}
-          NAME: dspace-${{ env.INSTANCE }}
-
-      - name: deploy dspace-import on dev-5
-        working-directory: build-scripts/run/
+      - name: vanilla import
+        env:
+          FNAME: old_dump.sql
         run: |
-          ./start.sh dspace-$INSTANCE
-          cd ../..
-          # this is not necessary, since extra.yml doesn't contain any new images that weren't pulled within script above
-          # 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
-          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
-
-          # this must be here and not in the start.sh, because extra.yml replaces dspace container
-          ## !!!!! please remove this section if you do not want handle server !!!!!!!
+          export DATADIR=$CONFIG_PATH/${{inputs.INSTANCE}}/dump/$FNAME
+          export DNAME=dspace${{inputs.INSTANCE}}
+          export DDBNAME=dspacedb${{inputs.INSTANCE}}
+    
+          echo "====="
+          docker stop $DNAME || true
+    
+          echo "====="
+          # echo Starting vanilla import DB
+          docker cp $DATADIR $DDBNAME:/tmp/
+          # drop + create + import + cleanup
+          docker exec $DDBNAME /bin/bash -c "dropdb -U dspace -p 10563 dspace && createdb -U dspace -p 10563 --owner=dspace --encoding=UNICODE dspace && psql -p 10563 -U dspace -d dspace -f /tmp/$FNAME && rm /tmp/$FNAME"
+          echo "====="
+          docker start $DNAME
+          sleep 60
+          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace database migrate ignored && ./dspace create-administrator -e test@test.edu -f admin -l user -p admin -c en -o dataquest"
+          echo "====="
+          # new user will not be accepted unless restarted
+          docker restart $DNAME
+          sleep 60
           echo "====="
-          echo "installing handle server"
-          docker exec dspace${INSTANCE} apt update
-          docker exec dspace${INSTANCE} apt install host -y
-          echo "installed host from apt"
-          docker exec dspace${INSTANCE} /dspace/bin/make-handle-config
-          echo "made handle config:"
-          docker exec dspace${INSTANCE} cat /dspace/handle-server/config.dct
-          docker exec dspace${INSTANCE} /dspace/bin/start-handle-server
-          echo "started handle server"
-          # this seems to be the easiest solution for now
-          docker restart dockerized-nginx-with-shibboleth-nginx-1
-          /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'
-
-
-  import-8:
-    runs-on: dspace-dep-1
-    if: inputs.IMPORT
-    needs: deploy-8
-    env:
-      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/
-          ASSETSTORE: /opt/dspace-data/clarin-dspace/assetstore/
-          LOGDIR: /log/
-
-      - name: dspace basic 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 reindex solr:"
-          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace index-discovery -b"
-
-          echo "dspace reindex OAI-PMH:"
-          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace oai import -c"
-
-          echo "dspace checker:"
-          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace checker -v -l"
 
       - name: dspace healthcheck
         run: |
-          export DNAME=dspace$INSTANCE
+          export DNAME=dspace${{inputs.INSTANCE}}
           echo "dspace healthcheck:"
           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() }}
-
-  rest-tests-after-deploy8:
-    runs-on: ubuntu-latest
-    needs: playwright-after-deploy8
-    timeout-minutes: 45
-    steps:
-      - name: run rest-tests
-        run: |
-          curl -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \
-          --request POST \
-          https://api.github.com/repos/dataquest-dev/\
-          dspace-rest-test/actions/workflows/run_unittests.yml/dispatches \
-          --data "{\"ref\":\"refs/heads/master\"}" 2> /dev/null
-
-          # wait for it to start
-          sleep 30s
-
-          # get result of last job
-          RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-
-          # while job did not finish, sleep
-          while [[ $RES == 'null' ]]; do
-            sleep 10s
-            RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-          done;
-
-          echo $RES
-          # if last result is not success, return -1 and fail
-          if [[ $RES != \"success\" ]]; then
-            echo "rest-tests have failed! check appropriate action run in the dspace-rest-test repository"
-            exit 1
-          fi;
-
-
-  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() }}
-
-  rest-tests-after-import8:
-    runs-on: ubuntu-latest
-    needs: playwright-after-import8
-    timeout-minutes: 45
-    steps:
-      - name: run rest-tests
-        run: |
-          curl -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \
-          --request POST \
-          https://api.github.com/repos/dataquest-dev/\
-          dspace-rest-test/actions/workflows/run_unittests.yml/dispatches \
-          --data "{\"ref\":\"refs/heads/master\"}" 2> /dev/null
-
-          # wait for it to start
-          sleep 30s
-
-          # get result of last job
-          RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-
-          # while job did not finish, sleep
-          while [[ $RES == 'null' ]]; do
-            sleep 10s
-            RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-          done;
-
-          echo $RES
-          # if last result is not success, return -1 and fail
-          if [[ $RES != \"success\" ]]; then
-            echo "rest-tests have failed! check appropriate action run in the dspace-rest-test repository"
-            exit 1
-          fi;