Skip to content

Commit

Permalink
Use cs3org/behat:latest docker image for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
phil-davis committed Jan 27, 2023
1 parent 6dbf069 commit dbf7b68
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 64 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ docs
grpc-tests
tests
tools
vendor-bin
*.md
8 changes: 1 addition & 7 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OC_CI_GOLANG = "owncloudci/golang:1.18"
OC_CI_ALPINE = "owncloudci/alpine:latest"
OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0"
REDIS = "redis:6-alpine"
OC_CI_PHP = "owncloudci/php:7.4"
OC_CI_PHP = "cs3org/behat:latest"
OC_LITMUS = "owncloud/litmus:latest"
OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:0.2.0"
OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest"
Expand Down Expand Up @@ -233,8 +233,6 @@ def virtualViews():
"image": OC_CI_PHP,
"commands": [
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-from-core-api",
],
"environment": {
Expand Down Expand Up @@ -579,8 +577,6 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
"image": OC_CI_PHP,
"commands": [
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-from-core-api",
],
"environment": {
Expand Down Expand Up @@ -657,8 +653,6 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
"image": OC_CI_PHP,
"commands": [
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-from-core-api",
],
"environment": {
Expand Down
12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,3 @@ mockery: $(MOCKERY)
.PHONY: go-generate
go-generate:
go generate ./...

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.
22 changes: 0 additions & 22 deletions composer.json

This file was deleted.

22 changes: 0 additions & 22 deletions vendor-bin/behat/composer.json

This file was deleted.

0 comments on commit dbf7b68

Please sign in to comment.