From eab4a8e27269c63a9548ec274e1f980274d5cc3e Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 22 Jan 2025 09:03:19 +0100 Subject: [PATCH 1/3] run tests in docker fix --- tests/acceptance/docker/src/serve-opencloud.sh | 2 +- tests/acceptance/expected-failures-API-on-OCIS-storage.md | 6 +++--- tests/ocwrapper/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/docker/src/serve-opencloud.sh b/tests/acceptance/docker/src/serve-opencloud.sh index 194fd17453..af1b4161a1 100644 --- a/tests/acceptance/docker/src/serve-opencloud.sh +++ b/tests/acceptance/docker/src/serve-opencloud.sh @@ -7,5 +7,5 @@ opencloud init if [ "$WITH_WRAPPER" = "true" ]; then ocwrapper serve --bin=opencloud else - oc server + opencloud server fi diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index b560b217f6..bd4531a01f 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -16,7 +16,7 @@ _ocdav: double-check the webdav property parsing when custom namespaces are used #### [file versions do not report the version author](https://github.com/owncloud/ocis/issues/2914) -- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14) +- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14) - [coreApiVersions/fileVersionAuthor.feature:60](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L60) - [coreApiVersions/fileVersionAuthor.feature:92](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L92) - [coreApiVersions/fileVersionAuthor.feature:123](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L123) @@ -163,9 +163,9 @@ _ocdav: api compatibility, return correct status code_ - [coreApiWebdavMove1/moveFolder.feature:217](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L217) - [coreApiWebdavMove1/moveFolder.feature:218](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L218) - [coreApiWebdavMove1/moveFolder.feature:219](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L219) -- [coreApiWebdavMove2/moveShareOnOpencloud.feature:334](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L334) +- [coreApiWebdavMove2/moveShareOnOpencloud.feature:334](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L334) - [coreApiWebdavMove2/moveShareOnOpenCloud.feature:337](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L337) -- [coreApiWebdavMove2/moveShareOnOpencloud.feature:340](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L340) +- [coreApiWebdavMove2/moveShareOnOpencloud.feature:340](https://github.com/opencloud-eu/opencloud/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L340) #### [COPY file/folder to same name is possible (but 500 code error for folder with spaces path)](https://github.com/owncloud/ocis/issues/8711) diff --git a/tests/ocwrapper/Makefile b/tests/ocwrapper/Makefile index f30c6b5bf9..0613f5a7fb 100644 --- a/tests/ocwrapper/Makefile +++ b/tests/ocwrapper/Makefile @@ -1,3 +1,3 @@ .PHONY: build build: - go build -o bin/ocwrapper \ No newline at end of file + env GOOS=linux GOARCH=arm64 go build -o bin/ocwrapper \ No newline at end of file From 991b6412488aee57584dc72479642f92659e03ba Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 22 Jan 2025 15:18:28 +0100 Subject: [PATCH 2/3] Update Makefile --- tests/ocwrapper/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/ocwrapper/Makefile b/tests/ocwrapper/Makefile index 0613f5a7fb..8f8a6f133b 100644 --- a/tests/ocwrapper/Makefile +++ b/tests/ocwrapper/Makefile @@ -1,3 +1,6 @@ .PHONY: build + +GOARCH := $(shell go env GOARCH) + build: - env GOOS=linux GOARCH=arm64 go build -o bin/ocwrapper \ No newline at end of file + env GOOS=linux GOARCH=$(GOARCH) go build -o bin/ocwrapper From 4b1f49e169365ab3e81840882922f50d14cb0ace Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Wed, 22 Jan 2025 16:24:36 +0100 Subject: [PATCH 3/3] fix: test makefiles --- tests/acceptance/docker/Makefile | 16 ++++++++-------- tests/ocwrapper/Makefile | 8 +++++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile index 2fef78280e..01a1ce62f3 100644 --- a/tests/acceptance/docker/Makefile +++ b/tests/acceptance/docker/Makefile @@ -190,22 +190,22 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container @if [ -n "${START_CEPH}" ]; then \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ COMPOSE_FILE=src/ceph.yml \ - docker-compose run start_ceph; \ + docker compose run start_ceph; \ fi; \ if [ "${START_EMAIL}" == "true" ]; then \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ COMPOSE_FILE=src/email.yml \ - docker-compose run start_email; \ + docker compose run start_email; \ fi; \ if [ "${START_ANTIVIRUS}" == "true" ]; then \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ COMPOSE_FILE=src/antivirus.yml \ - docker-compose run start_antivirus; \ + docker compose run start_antivirus; \ fi; \ if [ "${START_TIKA}" == "true" ]; then \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ COMPOSE_FILE=src/tika.yml \ - docker-compose run tika-service; \ + docker compose run tika-service; \ fi; \ COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ COMPOSE_FILE=$(COMPOSE_FILE) \ @@ -221,13 +221,13 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container BEHAT_FEATURE=$(BEHAT_FEATURE) \ DIVIDE_INTO_NUM_PARTS=$(DIVIDE_INTO_NUM_PARTS) \ RUN_PART=$(RUN_PART) \ - docker-compose up -d --build --force-recreate + docker compose up -d --build --force-recreate .PHONY: show-test-logs show-test-logs: ## show logs of test @COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ COMPOSE_FILE=$(COMPOSE_FILE) \ - docker-compose logs --no-log-prefix -f acceptance-tests | less + docker compose logs --no-log-prefix -f acceptance-tests | less $(OC_WRAPPER): @if [ "$(WITH_WRAPPER)" == "true" ]; then \ @@ -254,7 +254,7 @@ clean-docker-container: ## clean docker containers created during acceptance tes RUN_PART="" \ STORAGE_DRIVER="" \ TEST_SOURCE="" \ - docker-compose down --remove-orphans + docker compose down --remove-orphans .PHONY: clean-docker-volumes clean-docker-volumes: ## clean docker volumes created during acceptance tests @@ -266,7 +266,7 @@ clean-docker-volumes: ## clean docker volumes created during acceptance tests RUN_PART="" \ STORAGE_DRIVER="" \ TEST_SOURCE="" \ - docker-compose down --remove-orphans -v + docker compose down --remove-orphans -v .PHONY: clean-files clean-files: diff --git a/tests/ocwrapper/Makefile b/tests/ocwrapper/Makefile index 8f8a6f133b..45d24650b5 100644 --- a/tests/ocwrapper/Makefile +++ b/tests/ocwrapper/Makefile @@ -1,6 +1,8 @@ -.PHONY: build - +GOOS := linux ## only linux is supported GOARCH := $(shell go env GOARCH) +.PHONY: build build: - env GOOS=linux GOARCH=$(GOARCH) go build -o bin/ocwrapper + GOOS=$(GOOS) \ + GOARCH=$(GOARCH) \ + go build -o bin/ocwrapper