Skip to content

Commit

Permalink
Remove local previews tests,clean up and bump core commit id (#1952)
Browse files Browse the repository at this point in the history
  • Loading branch information
SwikritiT authored Aug 5, 2021
1 parent d3a32f8 commit 63bbab9
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 195 deletions.
2 changes: 1 addition & 1 deletion .drone.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The test runner source for API tests
CORE_COMMITID=de8b5a6256e6c4c358e913a4c3deb418fa1105cf
CORE_COMMITID=83a407af2fbabc6cd6bb2d6b9abfe62e85d2da64
CORE_BRANCH=master
64 changes: 1 addition & 63 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,14 @@ def cephService():
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, owncloudIntegrationTests and s3ngIntegrationTests
# implemented for: ocisIntegrationTests and s3ngIntegrationTests
return [
buildAndPublishDocker(),
buildOnly(),
testIntegration(),
release(),
litmusOcisOldWebdav(),
litmusOcisNewWebdav(),
localIntegrationTestsOcis(),
] + ocisIntegrationTests(6) + s3ngIntegrationTests(12)


Expand Down Expand Up @@ -518,67 +517,6 @@ def litmusOcisNewWebdav():
],
}

def localIntegrationTestsOcis():
return {
"kind": "pipeline",
"type": "docker",
"name": "local-integration-tests-ocis",
"platform": {
"os": "linux",
"arch": "amd64",
},
"trigger": {
"event": {
"include": [
"pull_request",
"tag",
],
},
},
"steps": [
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"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-oc-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-publiclink-ocis.toml &",
"/drone/src/cmd/revad/revad -c ldap-users.toml",
],
},
cloneOc10TestReposStep(),
{
"name": "localAPIAcceptanceTestsOcisStorage",
"image": "registry.cern.ch/docker.io/owncloudci/php:7.4",
"commands": [
"make test-acceptance-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/*-*-*-*",
"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": "~@skipOnOcis-OCIS-Storage",
"PATH_TO_CORE": "/drone/src/tmp/testrunner",
}
},
],
"services": [
ldapService(),
],
}

def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
pipelines = []
debugPartsEnabled = (len(skipExceptParts) != 0)
Expand Down
27 changes: 0 additions & 27 deletions tests/acceptance/config/behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,6 @@ default:
autoload:
'': '%paths.base%/../features/bootstrap'

suites:
apiOcisSpecific:
paths:
- '%paths.base%/../features/apiOcisSpecific'
context: &common_ldap_suite_context
parameters:
ldapAdminPassword: admin
ldapUsersOU: TestUsers
ldapGroupsOU: TestGroups
ldapInitialUserFilePath: /../../config/ldap-users.ldif
contexts:
- RevaContext:
- OccContext:
- FeatureContext: &common_feature_context_params
baseUrl: http://localhost:8080
adminUsername: admin
adminPassword: admin
regularUserPassword: 123456
ocPath: apps/testing/api/v1/occ
- CapabilitiesContext:
- ChecksumContext:
- FavoritesContext:
- FilesVersionsContext:
- PublicWebDavContext:
- TrashbinContext:
- WebDavPropertiesContext:

extensions:
jarnaiz\JUnitFormatter\JUnitFormatterExtension:
filename: report.xml
Expand Down

This file was deleted.

0 comments on commit 63bbab9

Please sign in to comment.