diff --git a/.github/actions/erase-db/action.yml b/.github/actions/erase-db/action.yml index 9ec7e828cd1..ec0ad2ce435 100644 --- a/.github/actions/erase-db/action.yml +++ b/.github/actions/erase-db/action.yml @@ -28,9 +28,6 @@ runs: env: NAME: ${{ inputs.NAME }} run: | - # # condition below was found by accident and appears to be useless. Investigate later. - # be sure to have INSTANCE set - # if [[ "x${NAME}" != "dspace-" ]]; then - docker volume rm $(docker volume ls --filter name="${NAME}_" -q) || true - # fi; + echo "Removing volumes for $(docker volume ls --filter name="${NAME}_" -q)" + docker volume rm $(docker volume ls --filter name="${NAME}_" -q) || true diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index 15c3b355089..4e17c221365 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -30,16 +30,16 @@ runs: - uses: actions/checkout@v4 with: - repository: dataquest-dev/dspace-import + repository: dataquest-dev/dspace-import-clarin ref: 'main' submodules: 'recursive' - path: 'dspace-import' + path: 'dspace-import-clarin' - name: stop and remove containers id: import shell: bash - working-directory: dspace-import/scripts + working-directory: dspace-import-clarin/scripts env: DATADIR: ${{ inputs.DATADIR }} DB5PORT: 15432 @@ -62,6 +62,7 @@ runs: echo Location of assetstore folder is empty. Not copping assetstore else docker cp ${{ inputs.ASSETSTORE }} dspace${{ inputs.INSTANCE }}:/dspace/ + docker exec -u root dspace${{ inputs.INSTANCE }} chown -R dspace:dspace /dspace/assetstore fi echo "=====" cd ../ diff --git a/.github/disabled-workflows/deploy.yml b/.github/disabled-workflows/deploy.yml index e6104dc8775..951a56d570c 100644 --- a/.github/disabled-workflows/deploy.yml +++ b/.github/disabled-workflows/deploy.yml @@ -109,6 +109,48 @@ jobs: /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-5: + runs-on: dspace-dep-1 + if: inputs.IMPORT + needs: deploy-5 + env: + INSTANCE: '5' + ENVFILE: /opt/dspace-envs/.env.dspace.dev-5 + steps: + - uses: ./.github/actions/import-db + with: + INSTANCE: ${{ env.INSTANCE }} + DATADIR: /opt/dspace-data/clarin-dspace-oxford/ + ASSETSTORE: /opt/dspace-data/clarin-dspace-oxford/assetstore/ + LOGDIR: /log/ + ADMIN_PASSWORD: ${{ secrets.DSPACE_ADMIN_PASSWORD }} + + - 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 + echo "dspace healthcheck:" + docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v" + import-8: runs-on: dspace-dep-1 if: inputs.IMPORT diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd038504e1c..400c22ce001 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,9 +49,6 @@ jobs: NODE_OPTIONS: '--max-old-space-size=4096' # Project name to use when running "docker compose" prior to e2e tests COMPOSE_PROJECT_NAME: 'ci' - # Docker Registry to use for Docker compose scripts below. - # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub. - #DOCKER_REGISTRY: ghcr.io strategy: # Create a matrix of Node versions to test against (in parallel) matrix: @@ -125,14 +122,6 @@ jobs: path: 'coverage/dspace-angular/lcov.info' retention-days: 14 - # Login to our Docker registry, so that we can access private Docker images using "docker compose" below. - #- name: Login to ${{ env.DOCKER_REGISTRY }} - # uses: docker/login-action@v3 - # with: - # registry: ${{ env.DOCKER_REGISTRY }} - # username: ${{ github.repository_owner }} - # password: ${{ secrets.GITHUB_TOKEN }} - # Using "docker compose" start backend using CI configuration # and load assetstore from a cached copy - name: Start DSpace REST Backend via Docker (for e2e tests) diff --git a/build-scripts/run/start.sh b/build-scripts/run/start.sh index 5dfdfc8cd4d..07a57418779 100755 --- a/build-scripts/run/start.sh +++ b/build-scripts/run/start.sh @@ -48,6 +48,7 @@ popd echo "=====" echo "Copy assetstore" docker cp assetstore dspace${INSTANCE}:/dspace/ +docker exec -u root dspace${INSTANCE} chown -R dspace:dspace /dspace/assetstore echo "=====" echo "Finished start.sh" diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html index c2f3c0db047..d19230e5e48 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.html +++ b/src/app/access-control/epeople-registry/epeople-registry.component.html @@ -26,7 +26,7 @@