Skip to content

Commit

Permalink
Removed unused make target, bump ocis commit id
Browse files Browse the repository at this point in the history
  • Loading branch information
grgprarup committed Jan 26, 2023
1 parent 74afdca commit d016c06
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .drone.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# The test runner source for API tests
APITESTS_COMMITID=6357a703181b368e2109f720e0785a11222eed88
APITESTS_COMMITID=6c0a5baec09e7f0716c55f58d7263d6943e95f89
APITESTS_BRANCH=master
APITESTS_REPO_GIT_URL=https://github.com/owncloud/ocis.git
6 changes: 3 additions & 3 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def cloneApiTestReposStep():
"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 https://github.com/owncloud/ocis.git /drone/src/tmp/testrunner",
"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",
],
Expand Down Expand Up @@ -178,7 +178,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-core-api",
"make test-acceptance-from-core-api",
],
"environment": {
"TEST_SERVER_URL": "http://revad-services:20080",
Expand Down Expand Up @@ -254,7 +254,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-core-api",
"make test-acceptance-from-core-api",
],
"environment": {
"TEST_SERVER_URL": "http://revad-services:20080",
Expand Down
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,10 @@ dist: gen-doc
go run tools/create-artifacts/main.go -version ${VERSION} -commit ${GIT_COMMIT} -goversion ${GO_VERSION}

BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
# behat config file for core api tests
CORE_BEHAT_YML=$(PATH_TO_APITESTS)/tests/acceptance/config/behat-core.yml

test-acceptance-api: vendor-bin/behat/vendor
BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api

test-acceptance-core-api: vendor-bin/behat/vendor
BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api

vendor/bamarni/composer-bin-plugin: composer.lock
composer install

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
../../../cmd/revad/revad -c ldap-users.toml
```
3. clone ownCloud 10
3. clone ownCloud Infinite Scale `OCIS`
```
git clone https://github.com/owncloud/core.git ./testrunner
git clone https://github.com/owncloud/ocis.git ./testrunner
```
4. to run the correct version of the testsuite check out the commit id from the `.drone.env` file
Expand All @@ -158,7 +158,7 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
TEST_REVA='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' \
EXPECTED_FAILURES_FILE=../reva/tests/acceptance/expected-failures-on-OCIS-storage.md \
make test-acceptance-api
make test-acceptance-from-core-api
```
This will run all tests that are relevant to reva.
Expand Down

0 comments on commit d016c06

Please sign in to comment.