From 92ea54dbdbf61b33f733e192bf07a8ee0812a6a8 Mon Sep 17 00:00:00 2001
From: Niraj Acharya <nirajacharyacode@gmail.com>
Date: Mon, 2 Sep 2024 11:22:45 +0545
Subject: [PATCH] merging ocis and core behat configs

---
 .drone.env  |  4 ++--
 .drone.star | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.drone.env b/.drone.env
index 6177d723a9..0062fcdd52 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,4 +1,4 @@
 # The test runner source for API tests
-APITESTS_COMMITID=854332e332890fe84ebef0fb34bcd05b2988051d
-APITESTS_BRANCH=master
+APITESTS_COMMITID=415a4b5f56a00a070b577770be384e65127a061a
+APITESTS_BRANCH=refactor-behat-command
 APITESTS_REPO_GIT_URL=https://github.com/owncloud/ocis.git
diff --git a/.drone.star b/.drone.star
index aab202d699..c938848c76 100644
--- a/.drone.star
+++ b/.drone.star
@@ -255,7 +255,7 @@ def virtualViews():
                 "image": OC_CI_PHP,
                 "commands": [
                     "cd /drone/src/tmp/testrunner",
-                    "make test-acceptance-from-core-api",
+                    "make test-acceptance-api",
                 ],
                 "environment": {
                     "TEST_SERVER_URL": "http://revad-services:20180",
@@ -267,6 +267,7 @@ def virtualViews():
                     "REGULAR_USER_PASSWORD": "relativity",
                     "SEND_SCENARIO_LINE_REFERENCES": "true",
                     "BEHAT_SUITE": "apiVirtualViews",
+                    "ACCEPTANCE_TEST_TYPE": "core-api",
                 },
             },
         ],
@@ -600,7 +601,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "make test-acceptance-from-core-api",
+                            "make test-acceptance-api",
                         ],
                         "environment": {
                             "TEST_SERVER_URL": "http://revad-services:20080",
@@ -616,6 +617,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
                             "DIVIDE_INTO_NUM_PARTS": parallelRuns,
                             "RUN_PART": runPart,
                             "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-OCIS-storage.md",
+                            "ACCEPTANCE_TEST_TYPE": "core-api",
                         },
                     },
                 ],
@@ -676,7 +678,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "make test-acceptance-from-core-api",
+                            "make test-acceptance-api",
                         ],
                         "environment": {
                             "TEST_SERVER_URL": "http://revad-services:20080",
@@ -692,6 +694,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
                             "DIVIDE_INTO_NUM_PARTS": parallelRuns,
                             "RUN_PART": runPart,
                             "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-S3NG-storage.md",
+                            "ACCEPTANCE_TEST_TYPE": "core-api",
                         },
                     },
                 ],
@@ -753,7 +756,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "make test-acceptance-from-core-api",
+                            "make test-acceptance-api",
                         ],
                         "environment": {
                             "TEST_SERVER_URL": "http://revad-services:20080",
@@ -769,6 +772,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []):
                             "DIVIDE_INTO_NUM_PARTS": parallelRuns,
                             "RUN_PART": runPart,
                             "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-on-POSIX-storage.md",
+                            "ACCEPTANCE_TEST_TYPE": "core-api",
                         },
                     },
                 ],