From c9651de7592e834da1a22064e6b6e47d42b8a50e Mon Sep 17 00:00:00 2001 From: Jannik Stehle <50302941+JammingBen@users.noreply.github.com> Date: Thu, 13 Jul 2023 16:24:49 +0200 Subject: [PATCH] [full-ci] chore: bump web to v7.1.0-alpha.2 (#6797) * chore: bump web to v7.1.0-alpha.2 * added FRONTEND_OCS_ENABLE_DENIALS to environment * try to run full search in ocis CI --------- Co-authored-by: Viktor Scharf --- .drone.env | 4 +-- .drone.star | 27 ++++++++++++++++--- services/web/Makefile | 2 +- ...expected-failures-webUI-on-OCIS-storage.md | 10 +++---- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.drone.env b/.drone.env index 28e8fe9ad1..18e5b123be 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=69ab5c83e6eba00ec99d1c8c5dcb62927722e9e7 -WEB_BRANCH=stable-7.0 +WEB_COMMITID=acd9fa2872134b79491096d35c7d577186397aac +WEB_BRANCH=master diff --git a/.drone.star b/.drone.star index bbbe7eea33..4c9f6bb354 100644 --- a/.drone.star +++ b/.drone.star @@ -3,6 +3,7 @@ # images ALPINE_GIT = "alpine/git:latest" +APACHE_TIKA = "apache/tika:2.8.0.0" CHKO_DOCKER_PUSHRM = "chko/docker-pushrm:1" INBUCKET_INBUCKET = "inbucket/inbucket" MINIO_MC = "minio/mc:RELEASE.2021-10-07T04-19-58Z" @@ -1132,7 +1133,6 @@ def e2eTests(ctx): "RETRY": "1", "WEB_UI_CONFIG": "%s/%s" % (dirs["base"], dirs["ocisConfig"]), "LOCAL_UPLOAD_DIR": "/uploads", - "SLOW_MO": "50", "API_TOKEN": "true", }, "commands": [ @@ -1146,7 +1146,8 @@ def e2eTests(ctx): restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis") + \ restoreWebCache() + \ restoreWebPnpmCache() + \ - ocisServer("ocis", 4, []) + \ + tikaService() + \ + ocisServer("ocis", 4, [], tika_enabled = True) + \ e2e_test_ocis + \ uploadTracingResult(ctx) + \ logTracingResults() @@ -1906,7 +1907,7 @@ def notify(): }, } -def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = [], deploy_type = "", extra_server_environment = {}, with_wrapper = False): +def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = [], deploy_type = "", extra_server_environment = {}, with_wrapper = False, tika_enabled = False): if deploy_type == "": user = "0:0" environment = { @@ -1928,7 +1929,13 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "OCIS_ASYNC_UPLOADS": True, "OCIS_EVENTS_ENABLE_TLS": False, "OCIS_DECOMPOSEDFS_METADATA_BACKEND": "messagepack", + "FRONTEND_OCS_ENABLE_DENIALS": True, } + if tika_enabled: + environment["FRONTEND_FULL_TEXT_SEARCH_ENABLED"] = True + environment["SEARCH_EXTRACTOR_TYPE"] = "tika" + environment["SEARCH_EXTRACTOR_TIKA_TIKA_URL"] = "http://tika:9998" + environment["SEARCH_EXTRACTOR_CS3SOURCE_INSECURE"] = True wait_for_ocis = { "name": "wait-for-ocis-server", "image": OC_CI_ALPINE, @@ -2782,3 +2789,17 @@ def waitForClamavService(): "wait-for -it clamav:3310 -t 600", ], }] + +def tikaService(): + return [{ + "name": "tika", + "type": "docker", + "image": APACHE_TIKA, + "detach": True, + }, { + "name": "wait-for-tika-service", + "image": OC_CI_WAIT_FOR, + "commands": [ + "wait-for -it tika:9998 -t 300", + ], + }] diff --git a/services/web/Makefile b/services/web/Makefile index c46ae345b9..118f59723f 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v7.0.1 +WEB_ASSETS_VERSION = v7.1.0-alpha.2 include ../../.make/recursion.mk diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index a30308520a..936a3e4f90 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -25,10 +25,10 @@ Other free text and Markdown formatting can be used elsewhere in the document if - [webUIFavorites/favoritesFile.feature:124](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/favoritesFile.feature#L124) - [webUIFavorites/unfavoriteFile.feature:12](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L12) - [webUIFavorites/unfavoriteFile.feature:33](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L33) -- [webUIFavorites/unfavoriteFile.feature:53](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L53) +- [webUIFavorites/unfavoriteFile.feature:54](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L53) - [webUIFavorites/unfavoriteFile.feature:70](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L70) -- [webUIFavorites/unfavoriteFile.feature:87](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L87) -- [webUIFavorites/unfavoriteFile.feature:102](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L102) +- [webUIFavorites/unfavoriteFile.feature:86](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L87) +- [webUIFavorites/unfavoriteFile.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L102) - [webUIResharing1/reshareUsers.feature:177](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L177) ### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256) @@ -60,7 +60,7 @@ Other free text and Markdown formatting can be used elsewhere in the document if - [webUISharingNotifications/shareWithUsers.feature:53](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/shareWithUsers.feature#L53) ### [Listing shares via ocs API does not show path for parent folders](https://github.com/owncloud/ocis/issues/1231) -- [webUISharingPublicManagement/shareByPublicLink.feature:127](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L127) +- [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) @@ -91,7 +91,7 @@ Other free text and Markdown formatting can be used elsewhere in the document if - [webUISharingPublicManagement/shareByPublicLink.feature:24](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L24) ### [Uploading folders does not work in files-drop](https://github.com/owncloud/web/issues/2443) -- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:245](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L245) +- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:265](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L245) ### [Resources cannot be locked under ocis](https://github.com/owncloud/ocis/issues/1284) - [webUIWebdavLockProtection/delete.feature:33](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L33)