From 4321549a44d605ca2a772ab4d3983984d98d7c19 Mon Sep 17 00:00:00 2001
From: Prarup Gurung <grgprarup@gmail.com>
Date: Thu, 26 Jan 2023 14:17:35 +0545
Subject: [PATCH] Removed unused make target, bump ocis commit id

---
 .drone.env  | 3 ++-
 .drone.star | 6 +++---
 Makefile    | 6 ------
 README.md   | 6 +++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.drone.env b/.drone.env
index 66a701b52d..42b29e6ba4 100644
--- a/.drone.env
+++ b/.drone.env
@@ -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
diff --git a/.drone.star b/.drone.star
index 080822a577..e422935bcc 100644
--- a/.drone.star
+++ b/.drone.star
@@ -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",
         ],
@@ -174,7 +174,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "make test-acceptance-core-api",
+                            "make test-acceptance-from-core-api",
                         ],
                         "environment": {
                             "TEST_SERVER_URL": "http://revad-services:20080",
@@ -248,7 +248,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "make test-acceptance-core-api",
+                            "make test-acceptance-from-core-api",
                         ],
                         "environment": {
                             "TEST_SERVER_URL": "http://revad-services:20080",
diff --git a/Makefile b/Makefile
index ef39b0fe97..6323b2693c 100644
--- a/Makefile
+++ b/Makefile
@@ -141,11 +141,5 @@ clean: toolchain-clean
 dist: gen-doc
 	go run tools/create-artifacts/main.go -version ${VERSION} -commit ${GIT_COMMIT} -goversion ${GO_VERSION}
 
-# behat config file for core api tests
-CORE_BEHAT_YML=$(PATH_TO_APITESTS)/tests/acceptance/config/behat-core.yml
-
 test-acceptance-api:
 	$(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api
-
-test-acceptance-core-api:
-	BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api
\ No newline at end of file
diff --git a/README.md b/README.md
index 6af17147b6..2493477cb9 100644
--- a/README.md
+++ b/README.md
@@ -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
@@ -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.