From 21a050711364b01d05c471601d89108dd0a8b179 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Wed, 27 Sep 2023 17:50:26 +0200 Subject: [PATCH] disable tests for s3ng storage --- .drone.star | 77 +-------------------------------- tests/docker/docker-compose.yml | 31 +------------ 2 files changed, 2 insertions(+), 106 deletions(-) diff --git a/.drone.star b/.drone.star index d90a8f98366..018fb2cf3e8 100644 --- a/.drone.star +++ b/.drone.star @@ -65,7 +65,7 @@ def main(ctx): return [ checkStarlark(), ocisIntegrationTest(), - ] + s3ngIntegrationTests() + ] def ocisIntegrationTest(): return { @@ -131,81 +131,6 @@ def ocisIntegrationTest(): ], } -def s3ngIntegrationTests(): - parallelRuns = 12 - pipelines = [] - for runPart in range(1, parallelRuns + 1): - if runPart in [9]: - 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": "~@provisioning_api-app-required&&~@skipOnOcis-OCIS-Storage&&~@personalSpace&&~@skipOnGraph&&~@carddav&&~@skipOnReva&&~@skipOnRevaMaster", - "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", diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index ad17b3b650b..94dd72d2963 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -213,35 +213,6 @@ services: interval: 5s timeout: 5s retries: 5 - acceptance-3: - extends: acceptance - environment: - TEST_SERVER_URL: http://frontend:20080 - STORAGE_DRIVER: S3NG - TEST_WITH_LDAP: 'true' - REVA_LDAP_HOSTNAME: ldap - TEST_REVA: 'true' - SEND_SCENARIO_LINE_REFERENCES: 'true' - BEHAT_FILTER_TAGS: ~@provisioning_api-app-required&&~@skipOnOcis-OCIS-Storage&&~@personalSpace&&~&&~@skipOnGraph&&~@carddav&&~@skipOnReva&&~@skipOnRevaMaster - 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 - ACCEPTANCE_TEST_TYPE: core-api - volumes: - - shared-volume:/var/tmp - working_dir: /mnt/ocis - depends_on: - gateway: - condition: service_healthy - frontend: - condition: service_healthy - shares: - condition: service_healthy - storage-publiclink: - condition: service_healthy - ldap-users: - condition: service_healthy - + volumes: shared-volume: