Use cs3org/behat:latest docker image for tests (#3629)

.dockerignore

@@ -4,5 +4,4 @@ docs
 grpc-tests
 tests
 tools
-vendor-bin
 *.md

.drone.star

@@ -1,7 +1,7 @@
 OC_CI_GOLANG = "owncloudci/golang:1.19"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0"
-OC_CI_PHP = "owncloudci/php:7.4"
+OC_CI_PHP = "cs3org/behat:latest"
 OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest"
 
 def makeStep():
@@ -109,8 +109,6 @@ def virtualViews():
                 "image": OC_CI_PHP,
                 "commands": [
                     "cd /drone/src",
-                    "composer self-update",
-                    "composer --version",
                     "make test-acceptance-api",
                 ],
                 "environment": {
@@ -176,8 +174,6 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "composer self-update",
-                            "composer --version",
                             "make test-acceptance-core-api",
                         ],
                         "environment": {
@@ -252,8 +248,6 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
                         "image": OC_CI_PHP,
                         "commands": [
                             "cd /drone/src/tmp/testrunner",
-                            "composer self-update",
-                            "composer --version",
                             "make test-acceptance-core-api",
                         ],
                         "environment": {

Makefile

@@ -141,24 +141,11 @@ clean: toolchain-clean
 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-api:
+	$(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
-
-vendor-bin/behat/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/behat/composer.lock
-	composer bin behat install --no-progress
-
-vendor-bin/behat/composer.lock: vendor-bin/behat/composer.json
-	@echo behat composer.lock is not up to date.
-
-composer.lock: composer.json
-	@echo composer.lock is not up to date.
+test-acceptance-core-api:
+	BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api

changelog/unreleased/enhancement-behat.md

@@ -0,0 +1,3 @@
+Enhancement: Use cs3org/behat:latest docker image for tests
+
+https://github.com/cs3org/reva/pull/3629