diff --git a/.drone.env b/.drone.env deleted file mode 100644 index e269faeea7a..00000000000 --- a/.drone.env +++ /dev/null @@ -1,4 +0,0 @@ -# The test runner source for API tests -APITESTS_COMMITID=9bcb6c1c1dc0018d3311525b2ff1e942d14996c7 -APITESTS_BRANCH=master -APITESTS_REPO_GIT_URL=https://github.com/owncloud/ocis.git diff --git a/.drone.star b/.drone.star deleted file mode 100644 index 3369e4e38a9..00000000000 --- a/.drone.star +++ /dev/null @@ -1,254 +0,0 @@ -OC_CI_GOLANG = "owncloudci/golang:1.19" -OC_CI_ALPINE = "owncloudci/alpine:latest" -OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0" -OC_CI_PHP = "cs3org/behat:latest" -OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest" - -def makeStep(): - return { - "name": "build", - "image": OC_CI_GOLANG, - "commands": [ - "make revad", - ], - } - -def cloneApiTestReposStep(): - return { - "name": "clone-api-test-repos", - "image": OC_CI_ALPINE, - "commands": [ - "source /drone/src/.drone.env", - "git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing", - "git clone -b $APITESTS_BRANCH --single-branch --no-tags $APITESTS_REPO_GIT_URL /drone/src/tmp/testrunner", - "cd /drone/src/tmp/testrunner", - "git checkout $APITESTS_COMMITID", - ], - } - -# Shared service definitions -def ldapService(): - return { - "name": "ldap", - "image": OSIXIA_OPEN_LDAP, - "pull": "always", - "environment": { - "LDAP_DOMAIN": "owncloud.com", - "LDAP_ORGANISATION": "ownCloud", - "LDAP_ADMIN_PASSWORD": "admin", - "LDAP_TLS_VERIFY_CLIENT": "never", - "HOSTNAME": "ldap", - }, - } - -def cephService(): - return { - "name": "ceph", - "image": "ceph/daemon", - "pull": "always", - "environment": { - "CEPH_DAEMON": "demo", - "NETWORK_AUTO_DETECT": "4", - "MON_IP": "0.0.0.0", - "CEPH_PUBLIC_NETWORK": "0.0.0.0/0", - "RGW_CIVETWEB_PORT": "4000 ", - "RGW_NAME": "ceph", - "CEPH_DEMO_UID": "test-user", - "CEPH_DEMO_ACCESS_KEY": "test", - "CEPH_DEMO_SECRET_KEY": "test", - "CEPH_DEMO_BUCKET": "test", - }, - } - -# Pipeline definitions -def main(ctx): - # In order to run specific parts only, specify the parts as - # ocisIntegrationTests(6, [1, 4]) - this will only run 1st and 4th parts - # implemented for: ocisIntegrationTests and s3ngIntegrationTests - return [ - checkStarlark(), - ] + ocisIntegrationTests(6) + s3ngIntegrationTests(12) - -def ocisIntegrationTests(parallelRuns, skipExceptParts = []): - pipelines = [] - debugPartsEnabled = (len(skipExceptParts) != 0) - for runPart in range(1, parallelRuns + 1): - if debugPartsEnabled and runPart not in skipExceptParts: - continue - - pipelines.append( - { - "kind": "pipeline", - "type": "docker", - "name": "ocis-integration-tests-%s" % runPart, - "platform": { - "os": "linux", - "arch": "amd64", - }, - "trigger": { - "event": { - "include": [ - "pull_request", - "tag", - ], - }, - }, - "steps": [ - makeStep(), - { - "name": "revad-services", - "image": OC_CI_GOLANG, - "detach": True, - "commands": [ - "cd /drone/src/tests/oc-integration-tests/drone/", - "/drone/src/cmd/revad/revad -c frontend.toml &", - "/drone/src/cmd/revad/revad -c gateway.toml &", - "/drone/src/cmd/revad/revad -c shares.toml &", - "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &", - "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &", - "/drone/src/cmd/revad/revad -c storage-publiclink.toml &", - "/drone/src/cmd/revad/revad -c ldap-users.toml", - ], - }, - cloneApiTestReposStep(), - { - "name": "APIAcceptanceTestsOcisStorage", - "image": OC_CI_PHP, - "commands": [ - "cd /drone/src/tmp/testrunner", - "make test-acceptance-from-core-api", - ], - "environment": { - "TEST_SERVER_URL": "http://revad-services:20080", - "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/", - "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*", - "STORAGE_DRIVER": "OCIS", - "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton", - "TEST_WITH_LDAP": "true", - "REVA_LDAP_HOSTNAME": "ldap", - "TEST_REVA": "true", - "SEND_SCENARIO_LINE_REFERENCES": "true", - "BEHAT_FILTER_TAGS": "~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis&&~@personalSpace&&~@issue-ocis-3023&&~@skipOnGraph&&~@caldav&&~@carddav&&~@skipOnReva", - "DIVIDE_INTO_NUM_PARTS": parallelRuns, - "RUN_PART": runPart, - "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-OCIS-storage.md", - }, - }, - ], - "services": [ - ldapService(), - ], - }, - ) - - return pipelines - -def s3ngIntegrationTests(parallelRuns, skipExceptParts = []): - pipelines = [] - debugPartsEnabled = (len(skipExceptParts) != 0) - for runPart in range(1, parallelRuns + 1): - if debugPartsEnabled and runPart not in skipExceptParts: - continue - - pipelines.append( - { - "kind": "pipeline", - "type": "docker", - "name": "s3ng-integration-tests-%s" % runPart, - "platform": { - "os": "linux", - "arch": "amd64", - }, - "trigger": { - "event": { - "include": [ - "pull_request", - "tag", - ], - }, - }, - "steps": [ - makeStep(), - { - "name": "revad-services", - "image": OC_CI_GOLANG, - "detach": True, - "commands": [ - "cd /drone/src/tests/oc-integration-tests/drone/", - "/drone/src/cmd/revad/revad -c frontend.toml &", - "/drone/src/cmd/revad/revad -c gateway.toml &", - "/drone/src/cmd/revad/revad -c shares.toml &", - "/drone/src/cmd/revad/revad -c storage-home-s3ng.toml &", - "/drone/src/cmd/revad/revad -c storage-users-s3ng.toml &", - "/drone/src/cmd/revad/revad -c storage-publiclink.toml &", - "/drone/src/cmd/revad/revad -c ldap-users.toml", - ], - }, - cloneApiTestReposStep(), - { - "name": "APIAcceptanceTestsS3ngStorage", - "image": OC_CI_PHP, - "commands": [ - "cd /drone/src/tmp/testrunner", - "make test-acceptance-from-core-api", - ], - "environment": { - "TEST_SERVER_URL": "http://revad-services:20080", - "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/", - "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*", - "STORAGE_DRIVER": "S3NG", - "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton", - "TEST_WITH_LDAP": "true", - "REVA_LDAP_HOSTNAME": "ldap", - "TEST_REVA": "true", - "SEND_SCENARIO_LINE_REFERENCES": "true", - "BEHAT_FILTER_TAGS": "~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis&&~@personalSpace&&~@issue-ocis-3023&&~&&~@skipOnGraph&&~@caldav&&~@carddav&&~@skipOnReva", - "DIVIDE_INTO_NUM_PARTS": parallelRuns, - "RUN_PART": runPart, - "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-S3NG-storage.md", - }, - }, - ], - "services": [ - ldapService(), - cephService(), - ], - }, - ) - - return pipelines - -def checkStarlark(): - return { - "kind": "pipeline", - "type": "docker", - "name": "check-starlark", - "steps": [ - { - "name": "format-check-starlark", - "image": OC_CI_BAZEL_BUILDIFIER, - "commands": [ - "buildifier --mode=check .drone.star", - ], - }, - { - "name": "show-diff", - "image": OC_CI_BAZEL_BUILDIFIER, - "commands": [ - "buildifier --mode=fix .drone.star", - "git diff", - ], - "when": { - "status": [ - "failure", - ], - }, - }, - ], - "depends_on": [], - "trigger": { - "ref": [ - "refs/pull/**", - ], - }, - } diff --git a/.github/workflows/compose.yml b/.github/workflows/compose.yml new file mode 100644 index 00000000000..df29361ffc0 --- /dev/null +++ b/.github/workflows/compose.yml @@ -0,0 +1,38 @@ +name: Compose +on: + workflow_call: + inputs: + test: + required: true + type: string + submodules: + type: boolean + parts: + type: number + part: + type: number + +jobs: + compose: + runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: ${{ inputs.submodules }} + - name: Download image + uses: ishworkh/docker-image-artifact-download@v1 + with: + image: revad:test + - name: Test + uses: isbang/compose-action@v1.4.1 + with: + compose-file: ./tests/docker/docker-compose.yml + compose-flags: --profile ${{ inputs.test }} + up-flags: --force-recreate --always-recreate-deps --build --abort-on-container-exit -V --remove-orphans --exit-code-from ${{ inputs.test }} + down-flags: --rmi all -v --remove-orphans + services: ${{ inputs.test }} + env: + REVAD_IMAGE: revad:test + PARTS: ${{ inputs.parts }} + PART: ${{ inputs.part }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7f091964ea5..64dc0e7d7f1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - if: ${{ inputs.push }} + if: inputs.push uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -45,7 +45,7 @@ jobs: platforms: ${{ inputs.platforms }} - name: Upload ${{ inputs.tags }} Docker image to artifacts uses: ishworkh/docker-image-artifact-upload@v1 - if: ${{ inputs.load }} + if: inputs.load with: image: ${{ inputs.tags }} retention_days: '1' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd401ac589d..cb636d57a99 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,34 +58,42 @@ jobs: file: docker/Dockerfile.revad tags: revad:test load: true - test: + litmus: needs: docker-revad - runs-on: self-hosted strategy: fail-fast: false matrix: - test: [litmus-1, litmus-2, litmus-3, acceptance-1] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Checkout core - uses: actions/checkout@v3 - if: matrix.test == 'acceptance-1' - with: - repository: owncloud/ocis - ref: ${{ vars.OCIS_COMMITID }} - path: tests/ocis - - name: Checkout testing - uses: actions/checkout@v3 - if: matrix.test == 'acceptance-1' - with: - repository: owncloud/testing - path: tests/testing - - name: Download image - uses: ishworkh/docker-image-artifact-download@v1 - with: - image: revad:test - - name: Test - run: make ${{ matrix.test }} -o test-docker - env: - REVAD_IMAGE: revad:test + test: [litmus-1, litmus-2, litmus-3] + uses: ./.github/workflows/compose.yml + with: + test: ${{ matrix.test }} + acceptance-1: + uses: ./.github/workflows/compose.yml + with: + test: acceptance-1 + submodules: true + needs: docker-revad + acceptance-2: + needs: docker-revad + strategy: + fail-fast: false + matrix: + part: [1, 2, 3, 4, 5, 6] + uses: ./.github/workflows/compose.yml + with: + test: acceptance-2 + submodules: true + parts: 6 + part: ${{ matrix.part }} + acceptance-3: + needs: docker-revad + strategy: + fail-fast: false + matrix: + part: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + uses: ./.github/workflows/compose.yml + with: + test: acceptance-3 + submodules: true + parts: 12 + part: ${{ matrix.part }} diff --git a/.gitignore b/.gitignore index f60c1b73522..6815c82dde0 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ docs/public/ docs/resources/ docs/node_modules/ docs/tech-doc-hugo -docs/themes/ dist/ bin/ diff --git a/.gitmodules b/.gitmodules index 263c4a1b71c..771d53eca43 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "docs/themes/docsy"] - path = docs/themes/docsy - url = https://github.com/google/docsy [submodule "tests/ocis"] path = tests/ocis url = https://github.com/owncloud/ocis.git [submodule "tests/testing"] path = tests/testing url = https://github.com/owncloud/testing.git +[submodule "docs/themes/docsy"] + path = docs/themes/docsy + url = https://github.com/google/docsy.git diff --git a/Makefile b/Makefile index f258245e4fb..1cc4f4989cb 100644 --- a/Makefile +++ b/Makefile @@ -50,22 +50,16 @@ reva: # Test ################################################################################ -REVAD_IMAGE ?= revad:test +TEST = litmus-1 litmus-2 litmus-3 acceptance-1 acceptance-2 acceptance-3 +export REVAD_IMAGE ?= revad:test +export PARTS ?= 1 +export PART ?= 1 -.PHONY: test-docker -test-docker: +.PHONY: $(TEST) +$(TEST): docker build -f docker/Dockerfile.revad -t $(REVAD_IMAGE) . - -TESTS = litmus-1 litmus-2 litmus-3 acceptance-1 -TIMEOUT ?= 3600 - -.PHONY: $(TESTS) -$(TESTS): test-docker - docker pull cs3org/behat:latest - REVAD_IMAGE=$(REVAD_IMAGE) \ - docker-compose --file tests/docker-compose/$@.yml --project-directory . \ - up --force-recreate --renew-anon-volumes --remove-orphans \ - --exit-code-from $@ --abort-on-container-exit --timeout $(TIMEOUT) + docker-compose -f ./tests/docker/docker-compose.yml --profile $@ up --force-recreate --always-recreate-deps --build --abort-on-container-exit -V --remove-orphans --exit-code-from $@ $@ + docker-compose -f ./tests/docker/docker-compose.yml --profile $@ down --rmi all -v --remove-orphans .PHONY: test-go test-go: @@ -117,7 +111,3 @@ toolchain-clean: .PHONY: clean clean: toolchain-clean rm -rf dist - - -test-acceptance-api: - $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api diff --git a/changelog/unreleased/enhancement-acceptance.md b/changelog/unreleased/enhancement-acceptance.md new file mode 100644 index 00000000000..a3fb1b15fa5 --- /dev/null +++ b/changelog/unreleased/enhancement-acceptance.md @@ -0,0 +1,5 @@ +Enhancement: Migrate acceptance tests from Drone to GitHub Actions + +Migrate ocisIntegrationTests and s3ngIntegrationTests to GitHub Actions + +https://github.com/cs3org/reva/pull/3640 \ No newline at end of file diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index b0e21f16f49..5429722ec4b 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -9,7 +9,7 @@ default: contexts: - RevaContext: - FeatureContext: &common_feature_context_params - baseUrl: http://localhost:20180 + baseUrl: http://frontend:20180 adminUsername: admin adminPassword: admin regularUserPassword: relativity diff --git a/tests/docker-compose/acceptance-1.yml b/tests/docker-compose/acceptance-1.yml deleted file mode 100644 index f5cf858993c..00000000000 --- a/tests/docker-compose/acceptance-1.yml +++ /dev/null @@ -1,72 +0,0 @@ -version: "3.3" -services: - gateway: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/gateway.toml - frontend: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/frontend-2.toml - storage-home-ocis: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-home-ocis.toml - volumes: - - shared-volume:/var/tmp - storage-local-1: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-local-1.toml - volumes: - - shared-volume:/var/tmp - storage-local-2: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-local-2.toml - volumes: - - shared-volume:/var/tmp - users: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/users.toml - acceptance-1: - image: cs3org/behat:latest - environment: - PATH_TO_APITESTS: /mnt/ocis - TEST_SERVER_URL: http://frontend:20180 - OCIS_REVA_DATA_ROOT: /var/tmp/reva/data/ - DELETE_USER_DATA_CMD: rm -rf /var/tmp/reva/data/nodes/root/* /var/tmp/reva/data/nodes/*-*-*-* /var/tmp/reva/data/blobs/* - STORAGE_DRIVER: OCIS - SKELETON_DIR: /mnt/testing/data/apiSkeleton - TEST_REVA: 'true' - REGULAR_USER_PASSWORD: relativity - SEND_SCENARIO_LINE_REFERENCES: 'true' - BEHAT_SUITE: apiVirtualViews - command: - - -c - - | - sleep 5 - /mnt/ocis/tests/acceptance/run.sh --type api - volumes: - - shared-volume:/var/tmp - - ./tests/testing:/mnt/testing - - ./tests/ocis:/mnt/ocis - - ./tests/acceptance:/mnt/acceptance - working_dir: /mnt/acceptance - depends_on: - - frontend - - gateway - - storage-home-ocis - - storage-local-1 - - storage-local-2 - - users - -volumes: - shared-volume: \ No newline at end of file diff --git a/tests/docker-compose/common.yml b/tests/docker-compose/common.yml deleted file mode 100644 index df71aa49381..00000000000 --- a/tests/docker-compose/common.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: "3.3" -services: - revad: - image: ${REVAD_IMAGE} - volumes: - - ../revad:/etc/revad - working_dir: /etc/revad/ - litmus: - image: registry.cern.ch/docker.io/owncloud/litmus:latest - entrypoint: - - /bin/sh - command: - - -c - - | - sleep 5 - /usr/local/bin/litmus-wrapper - environment: - LITMUS_USERNAME: einstein - LITMUS_PASSWORD: relativity - TESTS: basic http copymove props - LITMUS_WAIT: 'true' - LITMUS_CHECK_URL: http://frontend:20080/ocs/v2.php/cloud/capabilities diff --git a/tests/docker-compose/litmus-1.yml b/tests/docker-compose/litmus-1.yml deleted file mode 100644 index d379bef7279..00000000000 --- a/tests/docker-compose/litmus-1.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: "3.3" -services: - frontend: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/frontend-1.toml - gateway: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/gateway.toml - storage-home-ocis: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-home-ocis.toml - volumes: - - shared-volume:/var/tmp - users: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/users.toml - litmus-1: - extends: - file: tests/docker-compose/common.yml - service: litmus - environment: - LITMUS_URL: http://frontend:20080/remote.php/webdav - depends_on: - - frontend - - gateway - - users - - storage-home-ocis - -volumes: - shared-volume: diff --git a/tests/docker-compose/litmus-2.yml b/tests/docker-compose/litmus-2.yml deleted file mode 100644 index 60f4be4f5b9..00000000000 --- a/tests/docker-compose/litmus-2.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3.3" -services: - frontend: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/frontend-1.toml - gateway: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/gateway.toml - storage-home-ocis: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-home-ocis.toml - users: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/users.toml - litmus-2: - extends: - file: tests/docker-compose/common.yml - service: litmus - environment: - LITMUS_URL: http://frontend:20080/remote.php/dav/files/4c510ada-c86b-4815-8820-42cdf82c3d51 - depends_on: - - frontend - - gateway - - users - - storage-home-ocis \ No newline at end of file diff --git a/tests/docker-compose/litmus-3.yml b/tests/docker-compose/litmus-3.yml deleted file mode 100644 index b4755ebb264..00000000000 --- a/tests/docker-compose/litmus-3.yml +++ /dev/null @@ -1,60 +0,0 @@ -version: "3.3" -services: - frontend: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/frontend-1.toml - gateway: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/gateway.toml - storage-home-ocis: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-home-ocis.toml - volumes: - - shared-volume:/var/tmp - users: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/users.toml - permissions: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/permissions.toml - storage-users-ocis: - extends: - file: tests/docker-compose/common.yml - service: revad - command: -c /etc/revad/storage-users-ocis.toml - volumes: - - shared-volume:/var/tmp - litmus-3: - extends: - file: tests/docker-compose/common.yml - service: litmus - entrypoint: - - /bin/sh - command: - - -c - - | - curl -s -k -u einstein:relativity -I http://frontend:20080/remote.php/dav/files/einstein - export LITMUS_URL=http://frontend:20080/remote.php/dav/spaces/123e4567-e89b-12d3-a456-426655440000!$$(ls /var/tmp/reva/data/spaces/personal/) - /usr/local/bin/litmus-wrapper - volumes: - - shared-volume:/var/tmp - depends_on: - - frontend - - gateway - - users - - storage-home-ocis - - permissions - - storage-users-ocis - -volumes: - shared-volume: diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml new file mode 100644 index 00000000000..e983a280c32 --- /dev/null +++ b/tests/docker/docker-compose.yml @@ -0,0 +1,274 @@ +version: "3.3" +services: + revad: + image: ${REVAD_IMAGE} + volumes: + - ../revad:/etc/revad + working_dir: /etc/revad/ + litmus: + image: registry.cern.ch/docker.io/owncloud/litmus:latest + entrypoint: + - /bin/sh + command: + - -c + - | + sleep 5 + exec /usr/local/bin/litmus-wrapper + environment: + LITMUS_USERNAME: einstein + LITMUS_PASSWORD: relativity + TESTS: basic http copymove props + acceptance: + image: cs3org/behat:latest + volumes: + - ../testing:/mnt/testing + - ../ocis:/mnt/ocis + - ../acceptance:/mnt/acceptance + frontend: + profiles: [ "all", "litmus-1", "litmus-2", "litmus-3", "acceptance-2", "acceptance-3" ] + extends: revad + command: -c /etc/revad/frontend.toml + gateway: + profiles: [ "all", "litmus-1", "litmus-2", "litmus-3", "acceptance-1", "acceptance-2", "acceptance-3" ] + extends: revad + command: -c /etc/revad/gateway.toml + storage-home-ocis: + profiles: [ "all", "litmus-1", "litmus-2", "litmus-3", "acceptance-1", "acceptance-2" ] + extends: revad + hostname: storage-home + command: -c /etc/revad/storage-home-ocis.toml + volumes: + - shared-volume:/var/tmp + users: + profiles: [ "all", "litmus-1", "litmus-2", "litmus-3", "acceptance-1" ] + extends: revad + command: -c /etc/revad/users.toml + shares: + profiles: [ "all", "litmus-1", "litmus-2", "litmus-3", "acceptance-1", "acceptance-2", "acceptance-3" ] + extends: revad + command: -c /etc/revad/shares.toml + litmus-1: + profiles: [ "all", "litmus-1" ] + extends: litmus + environment: + LITMUS_URL: http://frontend:20080/remote.php/webdav + depends_on: + - frontend + - gateway + - storage-home-ocis + - users + - shares + litmus-2: + profiles: [ "all", "litmus-2" ] + extends: litmus + environment: + LITMUS_URL: http://frontend:20080/remote.php/dav/files/4c510ada-c86b-4815-8820-42cdf82c3d51 + depends_on: + - frontend + - gateway + - storage-home-ocis + - users + - shares + permissions-ocis-ci: + profiles: [ "all", "litmus-3" ] + extends: revad + command: -c /etc/revad/permissions-ocis-ci.toml + storage-users-ocis: + profiles: [ "all", "litmus-3", "acceptance-2" ] + extends: revad + hostname: storage-users + command: -c /etc/revad/storage-users-ocis.toml + volumes: + - shared-volume:/var/tmp + litmus-3: + profiles: [ "all", "litmus-3" ] + extends: litmus + command: + - -c + - | + sleep 5 + curl -s -k -u einstein:relativity -I http://frontend:20080/remote.php/dav/files/einstein + export LITMUS_URL=http://frontend:20080/remote.php/dav/spaces/123e4567-e89b-12d3-a456-426655440000!$$(ls /var/tmp/reva/data/spaces/personal/) + exec /usr/local/bin/litmus-wrapper + volumes: + - shared-volume:/var/tmp + depends_on: + - frontend + - gateway + - storage-home-ocis + - users + - shares + - permissions-ocis-ci + - storage-users-ocis + frontend-global: + profiles: [ "all", "acceptance-1" ] + extends: revad + hostname: frontend + command: -c /etc/revad/frontend-global.toml + storage-local-1: + profiles: [ "all", "acceptance-1" ] + extends: revad + command: -c /etc/revad/storage-local-1.toml + volumes: + - shared-volume:/var/tmp + storage-local-2: + profiles: [ "all", "acceptance-1" ] + extends: revad + command: -c /etc/revad/storage-local-2.toml + volumes: + - shared-volume:/var/tmp + acceptance-1: + profiles: [ "all", "acceptance-1" ] + extends: acceptance + environment: + PATH_TO_APITESTS: /mnt/ocis + TEST_SERVER_URL: http://frontend:20180 + OCIS_REVA_DATA_ROOT: /var/tmp/reva/data/ + DELETE_USER_DATA_CMD: rm -rf /var/tmp/reva/data/nodes/root/* /var/tmp/reva/data/nodes/*-*-*-* /var/tmp/reva/data/blobs/* + STORAGE_DRIVER: OCIS + SKELETON_DIR: /mnt/testing/data/apiSkeleton + TEST_REVA: "true" + REGULAR_USER_PASSWORD: relativity + SEND_SCENARIO_LINE_REFERENCES: "true" + BEHAT_SUITE: apiVirtualViews + volumes: + - shared-volume:/var/tmp + working_dir: /mnt/acceptance + command: + - -c + - | + sleep 5 + exec /mnt/ocis/tests/acceptance/run.sh --type api + depends_on: + - gateway + - storage-home-ocis + - users + - shares + - frontend-global + - storage-local-1 + - storage-local-2 + ldap: + profiles: [ "all", "acceptance-2", "acceptance-3" ] + image: osixia/openldap:1.3.0 + environment: + LDAP_DOMAIN: owncloud.com + LDAP_ORGANISATION: ownCloud + LDAP_ADMIN_PASSWORD: admin + LDAP_TLS_VERIFY_CLIENT: never + HOSTNAME: ldap + storage-publiclink: + profiles: [ "all", "acceptance-2", "acceptance-3" ] + extends: revad + command: -c /etc/revad/storage-publiclink.toml + volumes: + - shared-volume:/var/tmp + ldap-users: + profiles: [ "all", "acceptance-2", "acceptance-3" ] + extends: revad + hostname: users + command: -c /etc/revad/ldap-users.toml + depends_on: + - ldap + acceptance-2: + profiles: [ "all", "acceptance-2" ] + extends: acceptance + environment: + TEST_SERVER_URL: http://frontend:20080 + OCIS_REVA_DATA_ROOT: /var/tmp/reva/data/ + DELETE_USER_DATA_CMD: rm -rf /var/tmp/reva/data/nodes/root/* /var/tmp/reva/data/nodes/*-*-*-* /var/tmp/reva/data/blobs/* + STORAGE_DRIVER: OCIS + SKELETON_DIR: /mnt/testing/data/apiSkeleton + TEST_WITH_LDAP: 'true' + REVA_LDAP_HOSTNAME: ldap + TEST_REVA: 'true' + SEND_SCENARIO_LINE_REFERENCES: 'true' + BEHAT_FILTER_TAGS: ~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis&&~@personalSpace&&~@issue-ocis-3023&&~@skipOnGraph&&~@caldav&&~@carddav&&~@skipOnReva + DIVIDE_INTO_NUM_PARTS: ${PARTS:-1} + RUN_PART: ${PART:-1} + EXPECTED_FAILURES_FILE: /mnt/acceptance/expected-failures-on-OCIS-storage.md + BEHAT_YML: tests/acceptance/config/behat-core.yml + volumes: + - shared-volume:/var/tmp + working_dir: /mnt/ocis + command: + - -c + - | + sleep 5 + exec /mnt/ocis/tests/acceptance/run.sh --type core-api + depends_on: + - frontend + - gateway + - storage-home-ocis + - shares + - storage-users-ocis + - storage-publiclink + - ldap-users + ceph: + profiles: [ "all", "acceptance-3" ] + image: ceph/daemon + environment: + CEPH_DAEMON: demo + NETWORK_AUTO_DETECT: 4 + MON_IP: 0.0.0.0 + CEPH_PUBLIC_NETWORK: 0.0.0.0/0 + RGW_CIVETWEB_PORT: 4000 + RGW_NAME: ceph + CEPH_DEMO_UID: test-user + CEPH_DEMO_ACCESS_KEY: test + CEPH_DEMO_SECRET_KEY: test + CEPH_DEMO_BUCKET: test + storage-home-s3ng: + profiles: [ "all", "acceptance-3" ] + extends: revad + hostname: storage-home + command: -c /etc/revad/storage-home-s3ng.toml + volumes: + - shared-volume:/var/tmp + depends_on: + - ceph + storage-users-s3ng: + profiles: [ "all", "acceptance-3" ] + extends: revad + hostname: storage-users + command: -c /etc/revad/storage-users-s3ng.toml + volumes: + - shared-volume:/var/tmp + depends_on: + - ceph + acceptance-3: + profiles: [ "all", "acceptance-3" ] + extends: acceptance + environment: + TEST_SERVER_URL: http://frontend:20080 + OCIS_REVA_DATA_ROOT: /var/tmp/reva/data/ + DELETE_USER_DATA_CMD: rm -rf /var/tmp/reva/data/nodes/root/* /var/tmp/reva/data/nodes/*-*-*-* /var/tmp/reva/data/blobs/* + STORAGE_DRIVER": S3NG + SKELETON_DIR: /mnt/testing/data/apiSkeleton + TEST_WITH_LDAP: 'true' + REVA_LDAP_HOSTNAME: ldap + TEST_REVA: 'true' + SEND_SCENARIO_LINE_REFERENCES: 'true' + BEHAT_FILTER_TAGS: ~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis&&~@personalSpace&&~@issue-ocis-3023&&~&&~@skipOnGraph&&~@caldav&&~@carddav&&~@skipOnReva + DIVIDE_INTO_NUM_PARTS: ${PARTS:-1} + RUN_PART: ${PART:-1} + EXPECTED_FAILURES_FILE: /mnt/acceptance/expected-failures-on-S3NG-storage.md + BEHAT_YML: tests/acceptance/config/behat-core.yml + volumes: + - shared-volume:/var/tmp + working_dir: /mnt/ocis + command: + - -c + - | + sleep 5 + exec /mnt/ocis/tests/acceptance/run.sh --type core-api + depends_on: + - frontend + - gateway + - shares + - storage-publiclink + - ldap-users + - storage-home-s3ng + - storage-users-s3ng + +volumes: + shared-volume: diff --git a/tests/oc-integration-tests/drone/frontend-global.toml b/tests/oc-integration-tests/drone/frontend-global.toml deleted file mode 100644 index 12d5a2bc926..00000000000 --- a/tests/oc-integration-tests/drone/frontend-global.toml +++ /dev/null @@ -1,114 +0,0 @@ -# This config file will start a reva service that: -# - serves as the entrypoint for owncloud APIs but with a globally accessible namespace. -# - serves http endpoints on port 20180 -# - / --------------- ocdav -# - /ocs ------------ ocs -# - TODO(diocas): ocm - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -[http] -address = "0.0.0.0:20180" - -[http.middlewares.cors] -allow_credentials = true - -[http.services.ocdav] -# serve ocdav on the root path -prefix = "" -chunk_folder = "/drone/src/tmp/reva/chunks" -# for user lookups -# prefix the path of requests to /dav/files with this namespace -# While owncloud has only listed usernames at this endpoint CERN has -# been exposing more than just usernames. For owncloud deployments we -# can prefix the path to jail the requests to the correct CS3 namespace. -# In this deployment we mounted the owncloud storage provider at /users. It -# expects a username as the first path segment. -# currently, only the desktop client will use this endpoint, but only if -# the dav.chunking capability is available -# TODO implement a path wrapper that rewrites `` into the path -# layout for the users home? -# no, use GetHome? -# for eos we need to rewrite the path -# TODO strip the username from the path so the CS3 namespace can be mounted -# at the files/ endpoint? what about migration? separate reva instance -files_namespace = "/" - -# similar to the dav/files endpoint we can configure a prefix for the old webdav endpoint -# we use the old webdav endpoint to present the cs3 namespace -# note: this changes the tree that is rendered at remote.php/webdav from the users home to the cs3 namespace -# use webdav_namespace = "/home" to use the old namespace that only exposes the users files -# this endpoint should not affect the desktop client sync but will present different folders for the other clients: -# - the desktop clients use a hardcoded remote.php/dav/files/ if the dav.chunkung capability is present -# - the ios ios uses the core.webdav-root capability which points to remote.php/webdav in oc10 -# - the oc js sdk is hardcoded to the remote.php/webdav so it will see the new tree -# - TODO android? no sync ... but will see different tree -webdav_namespace = "/" - -[http.services.ocs] - -[http.services.ocs.capabilities.capabilities.core.status] -version = "10.0.11.5" -versionstring = "10.0.11" - -[http.services.ocs.capabilities.capabilities.files_sharing] -api_enabled = true -resharing = true -group_sharing = true -auto_accept_share = true -share_with_group_members_only = true -share_with_membership_groups_only = true -default_permissions = 22 -search_min_length = 3 - -[http.services.ocs.capabilities.capabilities.files_sharing.public] -enabled = true -send_mail = true -social_share = true -upload = true -multiple = true -supports_upload_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.password] -enforced = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.password.enforced_for] -read_only = true -read_write = true -upload_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.expire_date] -enabled = true - -[http.services.ocs.capabilities.capabilities.files_sharing.user] -send_mail = true - -[http.services.ocs.capabilities.capabilities.files_sharing.user_enumeration] -enabled = true -group_members_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.federation] -outgoing = true -incoming = true - -[http.services.ocs.capabilities.capabilities.notifications] -endpoints = [] - -[http.services.ocs.capabilities.capabilities.files.tus_support] -version = "1.0.0" -resumable = "1.0.0" -extension = "creation,creation-with-upload" -http_method_override = "" -max_chunk_size = 0 - -# serve /ocm -[http.services.ocmd] -prefix = "ocm" - -[http.middlewares.providerauthorizer] -driver = "json" - -[http.middlewares.providerauthorizer.drivers.json] -providers = "providers.demo.json" \ No newline at end of file diff --git a/tests/oc-integration-tests/drone/gateway.toml b/tests/oc-integration-tests/drone/gateway.toml deleted file mode 100644 index 85c17b20c22..00000000000 --- a/tests/oc-integration-tests/drone/gateway.toml +++ /dev/null @@ -1,83 +0,0 @@ -# This config file will start a reva service that: -# - serves as a gateway for all CS3 requests -# - looks up the storageprovider using a storageregistry -# - looks up the authprovider using an authregistry -# - serves the gateway on grpc port 19000 -# - serves http datagateway on port 19001 -# - /data - datagateway: file up and download - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -[grpc] -address = "0.0.0.0:19000" - -[grpc.services.gateway] -# registries -authregistrysvc = "localhost:19000" -storageregistrysvc = "localhost:19000" -# user metadata -preferencessvc = "localhost:18000" -userprovidersvc = "localhost:18000" -groupprovidersvc = "localhost:18000" -# an approvider lives on "localhost:18000" as well, see users.toml -# sharing -usershareprovidersvc = "localhost:17000" -publicshareprovidersvc = "localhost:17000" -# ocm -ocmcoresvc = "localhost:14000" -ocmshareprovidersvc = "localhost:14000" -ocminvitemanagersvc = "localhost:14000" -ocmproviderauthorizersvc = "localhost:14000" -# permissions -permissionssvc = "localhost:10000" -# other -commit_share_to_storage_grant = true -commit_share_to_storage_ref = true -share_folder = "Shares" -datagateway = "http://localhost:19001/data" -transfer_shared_secret = "replace-me-with-a-transfer-secret" # for direct uploads -transfer_expires = 6 # give it a moment -#disable_home_creation_on_login = true -link_grants_file = "/drone/src/tmp/reva/link_grants_file.json" - -[grpc.services.authregistry] -driver = "static" - -[grpc.services.authregistry.drivers.static.rules] -publicshares = "localhost:17000" # started with the shares.toml -basic = "localhost:18000" # started with the users.toml - -[grpc.services.storageregistry] -driver = "static" - -[grpc.services.storageregistry.drivers.static] -home_provider = "/home" - -[grpc.services.storageregistry.drivers.static.rules] - -# mount a home storage provider that uses a context based path wrapper -# to jail users into their home dir -"/home" = {"address" = "localhost:12000"} - -# mount a storage provider without a path wrapper for direct access to users. -"/users" = {"address" = "localhost:11000"} -"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:11000"} - -# the /virtual namespace is only accessible via the frontend-global service -"/virtual/[a-k]" = {"address" = "localhost:11100"} -"virtual-a-k" = {"address" = "localhost:11100"} -"/virtual/[l-z]" = {"address" = "localhost:11110"} -"virtual-l-z" = {"address" = "localhost:11110"} - -# another mount point might be "/projects/" - -"/public" = {"address" = "localhost:13000"} -"e1a73ede-549b-4226-abdf-40e69ca8230d" = {"address" = "localhost:13000"} - -[http] -address = "0.0.0.0:19001" - -[http.services.datagateway] -transfer_shared_secret = "replace-me-with-a-transfer-secret" diff --git a/tests/oc-integration-tests/drone/ocmd.toml b/tests/oc-integration-tests/drone/ocmd.toml deleted file mode 100644 index 0439d838565..00000000000 --- a/tests/oc-integration-tests/drone/ocmd.toml +++ /dev/null @@ -1,30 +0,0 @@ -# This config file will start a reva service that: -# - serves user and public link shares - -[shared] -jwt_secret = "Pive-Fumkiu4" - -[grpc] -address = "0.0.0.0:14000" - -[grpc.services.ocmcore] -driver = "json" - -# Note that ocmcore and ocmshareprovider should use the same file for storing the shares. -[grpc.services.ocmcore.drivers.json] -file = "/drone/src/var/tmp/reva/shares_server_1.json" - -[grpc.services.ocminvitemanager] -driver = "json" - -[grpc.services.ocmshareprovider] -driver = "json" - -[grpc.services.ocmshareprovider.drivers.json] -file = "/drone/src/var/tmp/reva/shares_server_1.json" - -[grpc.services.ocmproviderauthorizer] -driver = "json" - -[grpc.services.ocmproviderauthorizer.drivers.json] -providers = "providers.demo.json" diff --git a/tests/oc-integration-tests/drone/providers.demo.json b/tests/oc-integration-tests/drone/providers.demo.json deleted file mode 100644 index f2111b71b25..00000000000 --- a/tests/oc-integration-tests/drone/providers.demo.json +++ /dev/null @@ -1,100 +0,0 @@ -[ - { - "name": "local", - "full_name": "ownCloud@Example", - "organization": "Example", - "domain": "example.org", - "homepage": "http://example.org", - "description": "Example cloud storage.", - "services": [ - { - "endpoint": { - "type": { - "name": "OCM", - "description": "Example Open Cloud Mesh API" - }, - "name": "Example - OCM API", - "path": "http://127.0.0.1:20080/ocm/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:20080" - }, - { - "endpoint": { - "type": { - "name": "Webdav", - "description": "Example Webdav API" - }, - "name": "Example - Webdav API", - "path": "http://127.0.0.1:20080/remote.php/webdav/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:20080" - }, - { - "endpoint": { - "type": { - "name": "Gateway", - "description": "Example GRPC Gateway" - }, - "name": "Example - GRPC Gateway", - "path": "127.0.0.1:19000", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:19000" - } - ] - }, - { - "name": "local-mesh", - "full_name": "ownCloud@Example2", - "organization": "Example 2", - "domain": "example.org", - "homepage": "http://example.org", - "description": "Example cloud storage 2.", - "services": [ - { - "endpoint": { - "type": { - "name": "OCM", - "description": "Example 2 Open Cloud Mesh API" - }, - "name": "Example 2 - OCM API", - "path": "http://127.0.0.1:40080/ocm/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:40080" - }, - { - "endpoint": { - "type": { - "name": "Webdav", - "description": "Example 2 Webdav API" - }, - "name": "Example 2 - Webdav API", - "path": "http://127.0.0.1:40080/remote.php/webdav/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:40080" - }, - { - "endpoint": { - "type": { - "name": "Gateway", - "description": "Example 2 GRPC Gateway" - }, - "name": "Example 2 - GRPC Gateway", - "path": "127.0.0.1:39000", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:39000" - } - ] - } -] diff --git a/tests/oc-integration-tests/drone/storage-home-ocis.toml b/tests/oc-integration-tests/drone/storage-home-ocis.toml deleted file mode 100644 index 098aaf7fcab..00000000000 --- a/tests/oc-integration-tests/drone/storage-home-ocis.toml +++ /dev/null @@ -1,47 +0,0 @@ -# This config file will start a reva service that: -# - uses the ocis driver to serve users, jailed into their home (/home) -# - serves the home storage provider on grpc port 12000 -# - serves http dataprovider for this storage on port 12001 -# - /data - dataprovider: file up and download -# -# The home storage will inject the username into the path and jail users into -# their home directory - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -[grpc] -address = "0.0.0.0:12000" - -# This is a storage provider that grants direct access to the wrapped storage -# the context path wrapper reads tho username from the context and prefixes the relative storage path with it -[grpc.services.storageprovider] -driver = "ocis" -mount_path = "/home" -mount_id = "123e4567-e89b-12d3-a456-426655440000" -expose_data_server = true -data_server_url = "http://revad-services:12001/data" -enable_home_creation = true -gateway_addr = "0.0.0.0:19000" - -[grpc.services.storageprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data" -enable_home = true -treetime_accounting = true -treesize_accounting = true -gateway_addr = "0.0.0.0:19000" - -# we have a locally running dataprovider -[http] -address = "0.0.0.0:12001" - -[http.services.dataprovider] -driver = "ocis" -temp_folder = "/drone/src/tmp/reva/tmp" - -[http.services.dataprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data" -enable_home = true -treetime_accounting = true -treesize_accounting = true diff --git a/tests/oc-integration-tests/drone/storage-local-1.toml b/tests/oc-integration-tests/drone/storage-local-1.toml deleted file mode 100644 index 3b7d166d872..00000000000 --- a/tests/oc-integration-tests/drone/storage-local-1.toml +++ /dev/null @@ -1,46 +0,0 @@ -# This config file will start a reva service that: -# - uses the ocis driver to serve one half of a virtual view folder (/virtual/[a-k]) -# - serves the storage provider on grpc port 11100 -# - serves http dataprovider for this storage on port 11101 -# - /data - dataprovider: file up and download - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -[grpc] -address = "0.0.0.0:11100" - -# This is a storage provider that grants direct access to the wrapped storage -# we have a locally running dataprovider -[grpc.services.storageprovider] -driver = "ocis" -mount_path = "/virtual" -mount_id = "virtual-a-k" -expose_data_server = true -data_server_url = "http://localhost:11101/data" - -[grpc.services.storageprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data-local-1" -owner = "4c510ada-c86b-4815-8820-42cdf82c3d51" -owner_idp = "http://localhost:20080" -owner_type = "USER_TYPE_PRIMARY" -enable_home = false -treetime_accounting = true -treesize_accounting = true - -[http] -address = "0.0.0.0:11101" - -[http.services.dataprovider] -driver = "ocis" -temp_folder = "/drone/src/tmp/reva/tmp" - -[http.services.dataprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data-local-1" -owner = "4c510ada-c86b-4815-8820-42cdf82c3d51" -owner_idp = "http://localhost:20080" -owner_type = "USER_TYPE_PRIMARY" -enable_home = false -treetime_accounting = true -treesize_accounting = true diff --git a/tests/oc-integration-tests/drone/storage-local-2.toml b/tests/oc-integration-tests/drone/storage-local-2.toml deleted file mode 100644 index db3e79fe5f4..00000000000 --- a/tests/oc-integration-tests/drone/storage-local-2.toml +++ /dev/null @@ -1,46 +0,0 @@ -# This config file will start a reva service that: -# - uses the ocis driver to serve one half of a virtual view folder (/virtual/[l-z]) -# - serves the storage provider on grpc port 11110 -# - serves http dataprovider for this storage on port 11111 -# - /data - dataprovider: file up and download - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -[grpc] -address = "0.0.0.0:11110" - -# This is a storage provider that grants direct access to the wrapped storage -# we have a locally running dataprovider -[grpc.services.storageprovider] -driver = "ocis" -mount_path = "/virtual" -mount_id = "virtual-l-z" -expose_data_server = true -data_server_url = "http://localhost:11111/data" - -[grpc.services.storageprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data-local-2" -owner = "4c510ada-c86b-4815-8820-42cdf82c3d51" -owner_idp = "http://localhost:20080" -owner_type = "USER_TYPE_PRIMARY" -enable_home = false -treetime_accounting = true -treesize_accounting = true - -[http] -address = "0.0.0.0:11111" - -[http.services.dataprovider] -driver = "ocis" -temp_folder = "/drone/src/tmp/reva/tmp" - -[http.services.dataprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data-local-2" -owner = "4c510ada-c86b-4815-8820-42cdf82c3d51" -owner_idp = "http://localhost:20080" -owner_type = "USER_TYPE_PRIMARY" -enable_home = false -treetime_accounting = true -treesize_accounting = true diff --git a/tests/oc-integration-tests/drone/storage-users-ocis.toml b/tests/oc-integration-tests/drone/storage-users-ocis.toml deleted file mode 100644 index 795ba41d548..00000000000 --- a/tests/oc-integration-tests/drone/storage-users-ocis.toml +++ /dev/null @@ -1,42 +0,0 @@ -# This config file will start a reva service that: -# - uses the ocis driver to serve users (/users) -# - serves the storage provider on grpc port 11000 -# - serves http dataprovider for this storage on port 11001 -# - /data - dataprovider: file up and download - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -[grpc] -address = "0.0.0.0:11000" - -# This is a storage provider that grants direct access to the wrapped storage -# we have a locally running dataprovider -[grpc.services.storageprovider] -driver = "ocis" -mount_path = "/users" -mount_id = "123e4567-e89b-12d3-a456-426655440000" -expose_data_server = true -data_server_url = "http://revad-services:11001/data" -gateway_addr = "0.0.0.0:19000" - -[grpc.services.storageprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data" -treetime_accounting = true -treesize_accounting = true -userprovidersvc = "localhost:18000" -gateway_addr = "0.0.0.0:19000" - -# we have a locally running dataprovider -[http] -address = "0.0.0.0:11001" - -[http.services.dataprovider] -driver = "ocis" -temp_folder = "/drone/src/tmp/reva/tmp" - -[http.services.dataprovider.drivers.ocis] -root = "/drone/src/tmp/reva/data" -treetime_accounting = true -treesize_accounting = true diff --git a/tests/oc-integration-tests/drone/users.demo.json b/tests/oc-integration-tests/drone/users.demo.json deleted file mode 100644 index 893d69b99f7..00000000000 --- a/tests/oc-integration-tests/drone/users.demo.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "id": { - "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51", - "idp": "http://localhost:20080", - "type": 1 - }, - "username": "einstein", - "secret": "relativity", - "mail": "einstein@example.org", - "display_name": "Albert Einstein", - "groups": ["sailing-lovers", "violin-haters", "physics-lovers"] - }, - { - "id": { - "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", - "idp": "http://localhost:20080", - "type": 1 - }, - "username": "marie", - "secret": "radioactivity", - "mail": "marie@example.org", - "display_name": "Marie Curie", - "groups": ["radium-lovers", "polonium-lovers", "physics-lovers"] - }, - { - "id": { - "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c", - "idp": "http://localhost:20080", - "type": 1 - }, - "username": "richard", - "secret": "superfluidity", - "mail": "richard@example.org", - "display_name": "Richard Feynman", - "groups": ["quantum-lovers", "philosophy-haters", "physics-lovers"] - } -] diff --git a/tests/oc-integration-tests/drone/users.toml b/tests/oc-integration-tests/drone/users.toml deleted file mode 100644 index 6f849bf6a8b..00000000000 --- a/tests/oc-integration-tests/drone/users.toml +++ /dev/null @@ -1,21 +0,0 @@ -# This config file will start a reva service that: -# - handles user metadata and user preferences -# - serves the grpc services on port 18000 - -[shared] -jwt_secret = "Pive-Fumkiu4" - -[grpc] -address = "0.0.0.0:18000" - -[grpc.services.authprovider] -auth_manager = "json" - -[grpc.services.authprovider.auth_managers.json] -users = "users.demo.json" - -[grpc.services.userprovider] -driver = "json" - -[grpc.services.userprovider.drivers.json] -users = "users.demo.json" diff --git a/tests/ocis b/tests/ocis index 6357a703181..9bcb6c1c1dc 160000 --- a/tests/ocis +++ b/tests/ocis @@ -1 +1 @@ -Subproject commit 6357a703181b368e2109f720e0785a11222eed88 +Subproject commit 9bcb6c1c1dc0018d3311525b2ff1e942d14996c7 diff --git a/tests/revad/frontend-1.toml b/tests/revad/frontend-1.toml deleted file mode 100644 index 9a8433eff39..00000000000 --- a/tests/revad/frontend-1.toml +++ /dev/null @@ -1,125 +0,0 @@ -# This config file will start a reva service that: -# - serves as the entrypoint for owncloud APIs. -# - jails users into their home folder as in owncloud classic -# - serves http endpoints on port 20080 -# - / --------------- ocdav -# - /ocs ------------ ocs -# - TODO(diocas): ocm - -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "gateway:19000" - -[grpc] -address = "0.0.0.0:20099" - -[grpc.services.authprovider] -auth_manager = "oidc" - -# If you want to use your own openid provider change this config -[grpc.services.authprovider.auth_managers.oidc] -issuer = "http://localhost:20080" - -[http] -address = "0.0.0.0:20080" - -[http.middlewares.cors] -allow_credentials = true - -[http.services.ocdav] -# serve ocdav on the root path -prefix = "" -chunk_folder = "/var/tmp/reva/chunks" -# for user lookups -# prefix the path of requests to /dav/files with this namespace -# While owncloud has only listed usernames at this endpoint CERN has -# been exposing more than just usernames. For owncloud deployments we -# can prefix the path to jail the requests to the correct CS3 namespace. -# In this deployment we mounted the owncloud storage provider at /users. It -# expects a username as the first path segment. -# currently, only the desktop client will use this endpoint, but only if -# the dav.chunking capability is available -# TODO implement a path wrapper that rewrites `` into the path -# layout for the users home? -# no, use GetHome? -# for eos we need to rewrite the path -# TODO strip the username from the path so the CS3 namespace can be mounted -# at the files/ endpoint? what about migration? separate reva instance -files_namespace = "/users" - -# similar to the dav/files endpoint we can configure a prefix for the old webdav endpoint -# we use the old webdav endpoint to present the cs3 namespace -# note: this changes the tree that is rendered at remote.php/webdav from the users home to the cs3 namespace -# use webdav_namespace = "/home" to use the old namespace that only exposes the users files -# this endpoint should not affect the desktop client sync but will present different folders for the other clients: -# - the desktop clients use a hardcoded remote.php/dav/files/ if the dav.chunkung capability is present -# - the ios ios uses the core.webdav-root capability which points to remote.php/webdav in oc10 -# - the oc js sdk is hardcoded to the remote.php/webdav so it will see the new tree -# - TODO android? no sync ... but will see different tree -webdav_namespace = "/home" - -[http.services.ocs] - -[http.services.ocs.capabilities.capabilities.core.status] -version = "10.0.11.5" -versionstring = "10.0.11" - -[http.services.ocs.capabilities.capabilities.files_sharing] -api_enabled = true -resharing = true -group_sharing = true -auto_accept_share = true -share_with_group_members_only = true -share_with_membership_groups_only = true -default_permissions = 22 -search_min_length = 3 - -[http.services.ocs.capabilities.capabilities.files_sharing.public] -enabled = true -send_mail = true -social_share = true -upload = true -multiple = true -supports_upload_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.password] -enforced = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.password.enforced_for] -read_only = true -read_write = true -upload_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.expire_date] -enabled = true - -[http.services.ocs.capabilities.capabilities.files_sharing.user] -send_mail = true - -[http.services.ocs.capabilities.capabilities.files_sharing.user_enumeration] -enabled = true -group_members_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.federation] -outgoing = true -incoming = true - -[http.services.ocs.capabilities.capabilities.notifications] -endpoints = [] - -[http.services.ocs.capabilities.capabilities.files.tus_support] -version = "1.0.0" -resumable = "1.0.0" -extension = "creation,creation-with-upload" -http_method_override = "" -max_chunk_size = 0 - -# serve /ocm -[http.services.ocmd] -prefix = "ocm" - -[http.middlewares.providerauthorizer] -driver = "json" - -[http.middlewares.providerauthorizer.drivers.json] -providers = "providers.demo.json" \ No newline at end of file diff --git a/tests/revad/frontend-2.toml b/tests/revad/frontend-global.toml similarity index 100% rename from tests/revad/frontend-2.toml rename to tests/revad/frontend-global.toml diff --git a/tests/oc-integration-tests/drone/frontend.toml b/tests/revad/frontend.toml similarity index 97% rename from tests/oc-integration-tests/drone/frontend.toml rename to tests/revad/frontend.toml index 84ed3b43f78..cd7f07bfa09 100644 --- a/tests/oc-integration-tests/drone/frontend.toml +++ b/tests/revad/frontend.toml @@ -8,7 +8,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:20099" @@ -18,7 +18,7 @@ auth_manager = "oidc" # If you want to use your own openid provider change this config [grpc.services.authprovider.auth_managers.oidc] -issuer = "http://localhost:20080" +issuer = "http://frontend:20080" [http] address = "0.0.0.0:20080" @@ -29,7 +29,7 @@ allow_credentials = true [http.services.ocdav] # serve ocdav on the root path prefix = "" -chunk_folder = "/drone/src/tmp/reva/chunks" +chunk_folder = "/var/tmp/reva/chunks" # for user lookups # prefix the path of requests to /dav/files with this namespace # While owncloud has only listed usernames at this endpoint CERN has diff --git a/tests/revad/gateway.toml b/tests/revad/gateway.toml index db7ab07d855..27adbead5da 100644 --- a/tests/revad/gateway.toml +++ b/tests/revad/gateway.toml @@ -23,20 +23,20 @@ userprovidersvc = "users:18000" groupprovidersvc = "users:18000" # an approvider lives on "users:18000" as well, see users.toml # sharing -usershareprovidersvc = "localhost:17000" -publicshareprovidersvc = "localhost:17000" +usershareprovidersvc = "shares:17000" +publicshareprovidersvc = "shares:17000" # ocm -ocmcoresvc = "localhost:14000" -ocmshareprovidersvc = "localhost:14000" -ocminvitemanagersvc = "localhost:14000" -ocmproviderauthorizersvc = "localhost:14000" +ocmcoresvc = "ocmd:14000" +ocmshareprovidersvc = "ocmd:14000" +ocminvitemanagersvc = "ocmd:14000" +ocmproviderauthorizersvc = "ocmd:14000" # permissions -permissionssvc = "permissions:10000" +permissionssvc = "permissions-ocis-ci:10000" # other commit_share_to_storage_grant = true commit_share_to_storage_ref = true share_folder = "Shares" -datagateway = "http://localhost:19001/data" +datagateway = "http://gateway:19001/data" transfer_shared_secret = "replace-me-with-a-transfer-secret" # for direct uploads transfer_expires = 6 # give it a moment #disable_home_creation_on_login = true @@ -46,7 +46,7 @@ link_grants_file = "/var/tmp/reva/link_grants_file.json" driver = "static" [grpc.services.authregistry.drivers.static.rules] -publicshares = "localhost:17000" # started with the shares.toml +publicshares = "shares:17000" # started with the shares.toml basic = "users:18000" # started with the users.toml [grpc.services.storageregistry] @@ -59,11 +59,11 @@ home_provider = "/home" # mount a home storage provider that uses a context based path wrapper # to jail users into their home dir -"/home" = {"address" = "storage-home-ocis:12000"} +"/home" = {"address" = "storage-home:12000"} # mount a storage provider without a path wrapper for direct access to users. -"/users" = {"address" = "storage-users-ocis:11000"} -"123e4567-e89b-12d3-a456-426655440000" = {"address" = "storage-users-ocis:11000"} +"/users" = {"address" = "storage-users:11000"} +"123e4567-e89b-12d3-a456-426655440000" = {"address" = "storage-users:11000"} # the /virtual namespace is only accessible via the frontend-global service "/virtual/[a-k]" = {"address" = "storage-local-1:11100"} @@ -73,8 +73,8 @@ home_provider = "/home" # another mount point might be "/projects/" -"/public" = {"address" = "localhost:13000"} -"e1a73ede-549b-4226-abdf-40e69ca8230d" = {"address" = "localhost:13000"} +"/public" = {"address" = "storage-publiclink:13000"} +"e1a73ede-549b-4226-abdf-40e69ca8230d" = {"address" = "storage-publiclink:13000"} [http] address = "0.0.0.0:19001" diff --git a/tests/oc-integration-tests/drone/ldap-users.toml b/tests/revad/ldap-users.toml similarity index 94% rename from tests/oc-integration-tests/drone/ldap-users.toml rename to tests/revad/ldap-users.toml index 0cd4f47dab2..3d7561ad01b 100644 --- a/tests/oc-integration-tests/drone/ldap-users.toml +++ b/tests/revad/ldap-users.toml @@ -4,6 +4,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:18000" @@ -19,7 +20,7 @@ base_dn="dc=owncloud,dc=com" loginfilter="(&(objectclass=posixAccount)(|(cn={{login}}))(uid={{login}}))" bind_username="cn=admin,dc=owncloud,dc=com" bind_password="admin" -idp="http://localhost:18000" +idp="http://users:18000" [grpc.services.authprovider.auth_managers.ldap.schema] uid="uid" displayName="displayName" @@ -40,7 +41,7 @@ attributefilter="(&(objectclass=posixAccount)({{attr}}={{value}}))" groupfilter="(&(objectclass=posixGroup)(cn=*)(memberuid={{.OpaqueId}}))" bind_username="cn=admin,dc=owncloud,dc=com" bind_password="admin" -idp="http://localhost:18000" +idp="http://users:18000" [grpc.services.userprovider.drivers.ldap.schema] uid="uid" @@ -62,7 +63,7 @@ attributefilter="(&(objectclass=posixGroup)({{attr}}={{value}}))" memberfilter="(&(objectclass=posixAccount)(cn={{.OpaqueId}}))" bind_username="cn=admin,dc=owncloud,dc=com" bind_password="admin" -idp="http://localhost:18000" +idp="http://users:18000" [grpc.services.groupprovider.drivers.ldap.schema] gid="cn" diff --git a/tests/revad/permissions.toml b/tests/revad/permissions-ocis-ci.toml similarity index 90% rename from tests/revad/permissions.toml rename to tests/revad/permissions-ocis-ci.toml index ef025245f39..77261ac68ba 100644 --- a/tests/revad/permissions.toml +++ b/tests/revad/permissions-ocis-ci.toml @@ -2,6 +2,7 @@ # - serves the ocis ci permissions service [shared] jwt_secret = "Pive-Fumkiu4" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:10000" diff --git a/tests/revad/providers.demo.json b/tests/revad/providers.demo.json index 1c385e3bdf2..b2e5d08f64a 100644 --- a/tests/revad/providers.demo.json +++ b/tests/revad/providers.demo.json @@ -47,54 +47,5 @@ "host": "gateway:19000" } ] - }, - { - "name": "local-mesh", - "full_name": "ownCloud@Example2", - "organization": "Example 2", - "domain": "example.org", - "homepage": "http://example.org", - "description": "Example cloud storage 2.", - "services": [ - { - "endpoint": { - "type": { - "name": "OCM", - "description": "Example 2 Open Cloud Mesh API" - }, - "name": "Example 2 - OCM API", - "path": "http://127.0.0.1:40080/ocm/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:40080" - }, - { - "endpoint": { - "type": { - "name": "Webdav", - "description": "Example 2 Webdav API" - }, - "name": "Example 2 - Webdav API", - "path": "http://127.0.0.1:40080/remote.php/webdav/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:40080" - }, - { - "endpoint": { - "type": { - "name": "Gateway", - "description": "Example 2 GRPC Gateway" - }, - "name": "Example 2 - GRPC Gateway", - "path": "127.0.0.1:39000", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "127.0.0.1:39000" - } - ] } ] diff --git a/tests/oc-integration-tests/drone/shares.toml b/tests/revad/shares.toml similarity index 79% rename from tests/oc-integration-tests/drone/shares.toml rename to tests/revad/shares.toml index 34f5cf2c160..ac9e40e3b04 100644 --- a/tests/oc-integration-tests/drone/shares.toml +++ b/tests/revad/shares.toml @@ -3,6 +3,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:17000" @@ -14,7 +15,7 @@ driver = "memory" auth_manager = "publicshares" [grpc.services.authprovider.auth_managers.publicshares] -gateway_addr = "0.0.0.0:19000" +gateway_addr = "gateway:19000" [grpc.services.publicshareprovider.drivers.json] -file = "/drone/src/tmp/reva/publicshares.json" +file = "/var/tmp/reva/publicshares.json" diff --git a/tests/revad/storage-home-ocis.toml b/tests/revad/storage-home-ocis.toml index 4dfd693ecb5..633cde4d4bc 100644 --- a/tests/revad/storage-home-ocis.toml +++ b/tests/revad/storage-home-ocis.toml @@ -21,7 +21,7 @@ driver = "ocis" mount_path = "/home" mount_id = "123e4567-e89b-12d3-a456-426655440000" expose_data_server = true -data_server_url = "http://storage-home-ocis:12001/data" +data_server_url = "http://storage-home:12001/data" enable_home_creation = true gateway_addr = "gateway:19000" diff --git a/tests/oc-integration-tests/drone/storage-home-s3ng.toml b/tests/revad/storage-home-s3ng.toml similarity index 88% rename from tests/oc-integration-tests/drone/storage-home-s3ng.toml rename to tests/revad/storage-home-s3ng.toml index dfd784b567e..d8d6b82d7a4 100644 --- a/tests/oc-integration-tests/drone/storage-home-s3ng.toml +++ b/tests/revad/storage-home-s3ng.toml @@ -9,7 +9,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:12000" @@ -21,11 +21,11 @@ driver = "s3ng" mount_path = "/home" mount_id = "123e4567-e89b-12d3-a456-426655440000" expose_data_server = true -data_server_url = "http://revad-services:12001/data" +data_server_url = "http://storage-home:12001/data" enable_home_creation = true [grpc.services.storageprovider.drivers.s3ng] -root = "/drone/src/tmp/reva/data" +root = "/var/tmp/reva/data" enable_home = true treetime_accounting = true treesize_accounting = true @@ -41,10 +41,10 @@ address = "0.0.0.0:12001" [http.services.dataprovider] driver = "s3ng" -temp_folder = "/drone/src/tmp/reva/tmp" +temp_folder = "/var/tmp/reva/tmp" [http.services.dataprovider.drivers.s3ng] -root = "/drone/src/tmp/reva/data" +root = "/var/tmp/reva/data" enable_home = true treetime_accounting = true treesize_accounting = true diff --git a/tests/oc-integration-tests/drone/storage-publiclink.toml b/tests/revad/storage-publiclink.toml similarity index 87% rename from tests/oc-integration-tests/drone/storage-publiclink.toml rename to tests/revad/storage-publiclink.toml index f36aeb18fdd..78db1777b63 100644 --- a/tests/oc-integration-tests/drone/storage-publiclink.toml +++ b/tests/revad/storage-publiclink.toml @@ -3,7 +3,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:13000" @@ -13,5 +13,5 @@ address = "0.0.0.0:13000" [grpc.services.publicstorageprovider] mount_path = "/public/" mount_id = "e1a73ede-549b-4226-abdf-40e69ca8230d" -gateway_addr = "0.0.0.0:19000" +gateway_addr = "gateway:19000" diff --git a/tests/revad/storage-users-ocis.toml b/tests/revad/storage-users-ocis.toml index d7455393cb5..723e1686d4d 100644 --- a/tests/revad/storage-users-ocis.toml +++ b/tests/revad/storage-users-ocis.toml @@ -18,7 +18,7 @@ driver = "ocis" mount_path = "/users" mount_id = "123e4567-e89b-12d3-a456-426655440000" expose_data_server = true -data_server_url = "http://storage-users-ocis:11001/data" +data_server_url = "http://storage-users:11001/data" gateway_addr = "gateway:19000" [grpc.services.storageprovider.drivers.ocis] diff --git a/tests/oc-integration-tests/drone/storage-users-s3ng.toml b/tests/revad/storage-users-s3ng.toml similarity index 83% rename from tests/oc-integration-tests/drone/storage-users-s3ng.toml rename to tests/revad/storage-users-s3ng.toml index 63073c95857..022edf1a059 100644 --- a/tests/oc-integration-tests/drone/storage-users-s3ng.toml +++ b/tests/revad/storage-users-s3ng.toml @@ -6,7 +6,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:11000" @@ -17,13 +17,13 @@ driver = "s3ng" mount_path = "/users" mount_id = "123e4567-e89b-12d3-a456-426655440000" expose_data_server = true -data_server_url = "http://revad-services:11001/data" +data_server_url = "http://storage-users:11001/data" [grpc.services.storageprovider.drivers.s3ng] -root = "/drone/src/tmp/reva/data" +root = "/var/tmp/reva/data" treetime_accounting = true treesize_accounting = true -userprovidersvc = "localhost:18000" +userprovidersvc = "users:18000" "s3.endpoint" = "http://ceph:8080" "s3.region" = "default" "s3.bucket" = "test" @@ -36,10 +36,10 @@ address = "0.0.0.0:11001" [http.services.dataprovider] driver = "s3ng" -temp_folder = "/drone/src/tmp/reva/tmp" +temp_folder = "/var/tmp/reva/tmp" [http.services.dataprovider.drivers.s3ng] -root = "/drone/src/tmp/reva/data" +root = "/var/tmp/reva/data" treetime_accounting = true treesize_accounting = true "s3.endpoint" = "http://ceph:8080" diff --git a/tests/revad/users.toml b/tests/revad/users.toml index 6f849bf6a8b..492e2be0fd2 100644 --- a/tests/revad/users.toml +++ b/tests/revad/users.toml @@ -4,6 +4,7 @@ [shared] jwt_secret = "Pive-Fumkiu4" +gatewaysvc = "gateway:19000" [grpc] address = "0.0.0.0:18000"