From f172eb20ab92707a538acbc102a500df993e52ad Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Mon, 4 Sep 2023 17:31:14 +0200 Subject: [PATCH] [full-ci] chore: bump web to v8.0.0-alpha.1 (#7198) * chore: bump web to 8.0.0-alpha.1 --- .drone.env | 4 ++-- .drone.star | 4 ++-- services/web/Makefile | 2 +- tests/acceptance/docker/src/ocis-base.yml | 2 +- tests/acceptance/expected-failures-webUI-on-OCIS-storage.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.env b/.drone.env index 9ca94b0524..a871b9a7c7 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=a26f7920d4ef8bf57488b18e451525d16e246e9e -WEB_BRANCH=stable-7.1 +WEB_COMMITID=de510963a4c9d9eaa05ba69512fabb323a32bd73 +WEB_BRANCH=master diff --git a/.drone.star b/.drone.star index 63fdd68523..ba83888cb9 100644 --- a/.drone.star +++ b/.drone.star @@ -1096,7 +1096,7 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o "BACKEND_HOST": "https://ocis-server:9200", "RUN_ON_OCIS": "true", "OCIS_REVA_DATA_ROOT": "%s" % dirs["ocisRevaDataRoot"], - "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), + "WEB_UI_CONFIG_FILE": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "TEST_TAGS": finalFilterTags, "LOCAL_UPLOAD_DIR": "/uploads", "NODE_TLS_REJECT_UNAUTHORIZED": 0, @@ -1177,7 +1177,7 @@ def e2eTests(ctx): "HEADLESS": "true", "OCIS": "true", "RETRY": "1", - "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), + "WEB_UI_CONFIG_FILE": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "LOCAL_UPLOAD_DIR": "/uploads", "API_TOKEN": "true", }, diff --git a/services/web/Makefile b/services/web/Makefile index e5d7459a4c..46e1d4e338 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v7.1.0 +WEB_ASSETS_VERSION = v8.0.0-alpha.1 include ../../.make/recursion.mk diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml index 8a8d519372..e4d6b7e4c3 100644 --- a/tests/acceptance/docker/src/ocis-base.yml +++ b/tests/acceptance/docker/src/ocis-base.yml @@ -16,7 +16,7 @@ services: SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json SETTINGS_DATA_PATH: "/srv/app/tmp/ocis/settings" PROXY_ENABLE_BASIC_AUTH: "true" - WEB_UI_CONFIG: /drone/src/tests/config/drone/ocis-config.json + WEB_UI_CONFIG_FILE: /drone/src/tests/config/drone/ocis-config.json ACCOUNTS_HASH_DIFFICULTY: 4 OCIS_INSECURE: "true" IDM_CREATE_DEMO_USERS: "true" diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index e5f640cd16..2facb644a7 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -63,7 +63,7 @@ Other free text and Markdown formatting can be used elsewhere in the document if - [webUISharingPublicManagement/shareByPublicLink.feature:110](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L127) ### [Propfind response to trashbin endpoint is different in ocis](https://github.com/owncloud/product/issues/186) -- [webUIFilesSearch/search.feature:131](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L131) +- [webUIFilesSearch/search.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L60) ### [Conflict / overwrite issues with TUS](https://github.com/owncloud/ocis/issues/1294) - [webUIUpload/uploadFileGreaterThanQuotaSize.feature:11](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature#L11)