From 0e1d9b990f266700d02c8d4a1b1cac84e13dd928 Mon Sep 17 00:00:00 2001 From: Pascal Wengerter Date: Wed, 8 Dec 2021 12:23:28 +0100 Subject: [PATCH] [full-ci] Bump web to v4.6.0 (#2846) * Bump web to v4.6.0 * [full-ci]Bump web commitic in CI * Start middleware in accounts & settings CI pipelines, update expected failures Co-authored-by: Dipak Acharya --- .drone.env | 2 +- .drone.star | 32 +++++++++++++++++-- changelog/unreleased/update-web-4.6.0.md | 8 +++++ ...expected-failures-webUI-on-OCIS-storage.md | 16 ++++++---- web/Makefile | 2 +- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 changelog/unreleased/update-web-4.6.0.md diff --git a/.drone.env b/.drone.env index 109fb7a77..04c78573c 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=4bbd91de68aefdf94c03d2920a3353702f856280 CORE_BRANCH=acceptance-test-changes-waiting-2021-11 # The test runner source for UI tests -WEB_COMMITID=82e69d203bfb44a2a652a4c052fe7ce795bb1100 +WEB_COMMITID=ed4a8b32240b59666a6c2b162d95b50ff7191eb8 WEB_BRANCH=master diff --git a/.drone.star b/.drone.star index f718437f4..b50e5611e 100644 --- a/.drone.star +++ b/.drone.star @@ -594,6 +594,7 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1, "RUN_PART": runPart, "DIVIDE_INTO_NUM_PARTS": numberOfParts, "EXPECTED_FAILURES_FILE": "/drone/src/tests/acceptance/expected-failures-webUI-on-%s-storage%s.md" % (storage.upper(), expectedFailuresFileFilterTags), + "MIDDLEWARE_HOST": "http://middleware:3000", }, "commands": [ ". /drone/src/.drone.env", @@ -615,7 +616,7 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1, }], }, ] + failEarly(ctx, early_fail), - "services": selenium(), + "services": selenium() + middlewareService(), "volumes": [pipelineVolumeOC10Tests] + [{ "name": "uploads", @@ -658,6 +659,7 @@ def accountsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4): "NODE_TLS_REJECT_UNAUTHORIZED": 0, "WEB_PATH": "/srv/app/web", "FEATURE_PATH": "/drone/src/accounts/ui/tests/acceptance/features", + "MIDDLEWARE_HOST": "http://middleware:3000", }, "commands": [ ". /drone/src/.drone.env", @@ -678,7 +680,7 @@ def accountsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4): }], }, ] + failEarly(ctx, early_fail), - "services": selenium(), + "services": selenium() + middlewareService(), "volumes": [stepVolumeOC10Tests] + [{ "name": "uploads", @@ -721,6 +723,7 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4): "NODE_TLS_REJECT_UNAUTHORIZED": 0, "WEB_PATH": "/srv/app/web", "FEATURE_PATH": "/drone/src/settings/ui/tests/acceptance/features", + "MIDDLEWARE_HOST": "http://middleware:3000", }, "commands": [ ". /drone/src/.drone.env", @@ -746,7 +749,7 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4): "name": "redis", "image": "redis:6-alpine", }, - ] + selenium(), + ] + selenium() + middlewareService(), "volumes": [stepVolumeOC10Tests] + [{ "name": "uploads", @@ -1417,6 +1420,29 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []): }, ] +def middlewareService(): + return [{ + "name": "middleware", + "image": "owncloud/owncloud-test-middleware", + "pull": "always", + "environment": { + "BACKEND_HOST": "https://ocis-server:9200", + "OCIS_REVA_DATA_ROOT": "/srv/app/tmp/ocis/storage/owncloud/", + "RUN_ON_OCIS": "true", + "HOST": "middleware", + "REMOTE_UPLOAD_DIR": "/uploads", + "NODE_TLS_REJECT_UNAUTHORIZED": "0", + "MIDDLEWARE_HOST": "middleware", + }, + "volumes": [{ + "name": "uploads", + "path": "/uploads", + }, { + "name": "gopath", + "path": "/srv/app", + }], + }] + def cloneCoreRepos(): return [ { diff --git a/changelog/unreleased/update-web-4.6.0.md b/changelog/unreleased/update-web-4.6.0.md new file mode 100644 index 000000000..05cb15e9b --- /dev/null +++ b/changelog/unreleased/update-web-4.6.0.md @@ -0,0 +1,8 @@ +Enhancement: Update ownCloud Web to v4.6.0 + +Tags: web + +We updated ownCloud Web to v4.6.0. Please refer to the changelog (linked) for details on the web release. + +https://github.com/owncloud/ocis/pull/2846 +https://github.com/owncloud/web/releases/tag/v4.6.0 diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index 30ca76a42..6f471f471 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -125,12 +125,12 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIFilesCopy/copyPrivateLinks.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L21) ### [Versions Cleanup not available](https://github.com/owncloud/ocis/issues/1310) +- [webUIFilesActionMenu/versions.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L37) - [webUIFilesActionMenu/versions.feature:48](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L48) -- [webUIFilesActionMenu/versions.feature:59](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L59) -- [webUIFilesActionMenu/versions.feature:74](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L74) +- [webUIFilesActionMenu/versions.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L63) ### [Change the file content of a received shared file](https://github.com/owncloud/ocis/issues/2319) -- [webUIFilesActionMenu/versions.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L88) +- [webUIFilesActionMenu/versions.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L77) ### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317) - [webUIRestrictSharing/restrictReSharing.feature:23](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictReSharing.feature#L23) @@ -145,6 +145,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingAutocompletion/shareAutocompletion.feature:128](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L128) - [webUISharingAutocompletion/shareAutocompletion.feature:141](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L141) +### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317) ### [First request with a recreated user returns a 401 error](https://github.com/owncloud/ocis/issues/1675) - [webUISharingAutocompletion/shareAutocompletion.feature:76](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L76) - [webUISharingAutocompletion/shareAutocompletion.feature:115](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L115) @@ -215,6 +216,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIFilesCopy/copy.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L98) - [webUIMoveFilesFolders/moveFiles.feature:97](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature#L97) - [webUIMoveFilesFolders/moveFolders.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature#L72) +- [webUIFilesActionMenu/versions.feature:90](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L90) ### [Accepting different shares with same filename from different users overwrites one file](https://github.com/owncloud/ocis/issues/713) - [webUISharingAcceptShares/acceptShares.feature:212](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L212) @@ -228,6 +230,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L71) ### [Share Permissions](https://github.com/owncloud/ocis/issues/1277) +### [Deletion of a selected user/group as a collaborator has unusual behavior in UI](https://github.com/owncloud/web/issues/5857) - [webUISharingFilePermissionsGroups/sharePermissionsGroup.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature#L62) - [webUISharingFilePermissionsGroups/sharePermissionsGroup.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature#L63) - [webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature#L63) @@ -240,6 +243,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L62) ### [Advanced Permissions role is not displayed](https://github.com/owncloud/ocis/issues/1922) +### [Deletion of a selected user/group as a collaborator has unusual behavior in UI](https://github.com/owncloud/web/issues/5857) - [webUISharingFilePermissionsGroups/sharePermissionsGroup.feature:64](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature#L64) - [webUISharingFilePermissionsGroups/sharePermissionsGroup.feature:65](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature#L65) - [webUISharingFilePermissionsGroups/sharePermissionsGroup.feature:66](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature#L66) @@ -392,12 +396,12 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:187](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L187) ### [Deletion of a recursive folder from trashbin is not possible](https://github.com/owncloud/product/issues/188) -- [webUITrashbinDelete/trashbinDelete.feature:105](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L105) -- [webUITrashbinDelete/trashbinDelete.feature:85](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L85) +- [webUITrashbinDelete/trashbinDelete.feature:86](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L86) +- [webUITrashbinDelete/trashbinDelete.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L72) - [webUITrashbinDelete/trashbinDelete.feature:49](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L49) ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017) -- [webUIDeleteFilesFolders/deleteFilesFolders.feature:144](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L144) +- [webUIDeleteFilesFolders/deleteFilesFolders.feature:131](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L131) - [webUIFilesSearch/search.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L63) - [webUIFilesSearch/search.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L71) - [webUIFilesSearch/search.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L84) diff --git a/web/Makefile b/web/Makefile index faf3c5cca..2d9c78e62 100644 --- a/web/Makefile +++ b/web/Makefile @@ -29,7 +29,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: pull-assets -WEB_ASSETS_VERSION = v4.5.0 +WEB_ASSETS_VERSION = v4.6.0 .PHONY: pull-assets pull-assets: