From 578e8363682af0ce3970f0e47e0346701b3dcdab Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 27 Apr 2022 11:36:24 +0200 Subject: [PATCH 1/7] use ocis server in UI test and use middleware with changings --- .drone.star | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index e5794bea7ae..94b5cc5615a 100644 --- a/.drone.star +++ b/.drone.star @@ -18,7 +18,7 @@ OC_CI_NODEJS = "owncloudci/nodejs:%s" OC_CI_PHP = "owncloudci/php:%s" OC_CI_WAIT_FOR = "owncloudci/wait-for:latest" OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:latest" -OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.4.1" +OC_OC_TEST_MIDDLEWARE = "56940/owncloud-test-middleware:latest" OC_SERVER = "owncloud/server:10" OC_UBUNTU = "owncloud/ubuntu:18.04" OSIXIA_OPEN_LDAP = "osixia/openldap:latest" @@ -698,7 +698,7 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1, "arch": "amd64", }, "steps": skipIfUnchanged(ctx, "acceptance-tests") + restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis") + - ocisServerWithAccounts(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + waitForSeleniumService() + waitForMiddlewareService() + [ + ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + waitForSeleniumService() + waitForMiddlewareService() + [ { "name": "webUITests", "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION, @@ -1845,6 +1845,7 @@ def middlewareService(): "REMOTE_UPLOAD_DIR": "/uploads", "NODE_TLS_REJECT_UNAUTHORIZED": "0", "MIDDLEWARE_HOST": "middleware", + "RUN_WITH_IDM": "true", }, "volumes": [{ "name": "uploads", From 8bee2566eff0552820bd865a3d97baa643a49608 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 27 Apr 2022 15:59:41 +0200 Subject: [PATCH 2/7] back to default middleware --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 94b5cc5615a..f692aec6572 100644 --- a/.drone.star +++ b/.drone.star @@ -18,7 +18,7 @@ OC_CI_NODEJS = "owncloudci/nodejs:%s" OC_CI_PHP = "owncloudci/php:%s" OC_CI_WAIT_FOR = "owncloudci/wait-for:latest" OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:latest" -OC_OC_TEST_MIDDLEWARE = "56940/owncloud-test-middleware:latest" +OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:latest" OC_SERVER = "owncloud/server:10" OC_UBUNTU = "owncloud/ubuntu:18.04" OSIXIA_OPEN_LDAP = "osixia/openldap:latest" @@ -1845,7 +1845,7 @@ def middlewareService(): "REMOTE_UPLOAD_DIR": "/uploads", "NODE_TLS_REJECT_UNAUTHORIZED": "0", "MIDDLEWARE_HOST": "middleware", - "RUN_WITH_IDM": "true", + "TEST_WITH_GRAPH_API": "true", }, "volumes": [{ "name": "uploads", From 536c7531f5f4957149e234c74cb19b85eae483f3 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 27 Apr 2022 16:50:16 +0200 Subject: [PATCH 3/7] Update .drone.star change middleware tag --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index f692aec6572..c1d101267ef 100644 --- a/.drone.star +++ b/.drone.star @@ -18,7 +18,7 @@ OC_CI_NODEJS = "owncloudci/nodejs:%s" OC_CI_PHP = "owncloudci/php:%s" OC_CI_WAIT_FOR = "owncloudci/wait-for:latest" OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:latest" -OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:latest" +OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.5.0" OC_SERVER = "owncloud/server:10" OC_UBUNTU = "owncloud/ubuntu:18.04" OSIXIA_OPEN_LDAP = "osixia/openldap:latest" From b72ea412b9620869005776e021ae4f6fb81f18ac Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Fri, 29 Apr 2022 09:30:02 +0200 Subject: [PATCH 4/7] run tests with my middleware image --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index c1d101267ef..381b53459c8 100644 --- a/.drone.star +++ b/.drone.star @@ -18,7 +18,7 @@ OC_CI_NODEJS = "owncloudci/nodejs:%s" OC_CI_PHP = "owncloudci/php:%s" OC_CI_WAIT_FOR = "owncloudci/wait-for:latest" OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:latest" -OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.5.0" +OC_OC_TEST_MIDDLEWARE = "56940/owncloud-test-middleware:latest" OC_SERVER = "owncloud/server:10" OC_UBUNTU = "owncloud/ubuntu:18.04" OSIXIA_OPEN_LDAP = "osixia/openldap:latest" From 30b7c4243a974c89a06365c5d4f6f74cf5545cb2 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Fri, 29 Apr 2022 13:35:41 +0200 Subject: [PATCH 5/7] use web commitId --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index 2bc45c22d32..7ac41b90960 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=b262ada63569e241f9cee451c23f267512fd48b2 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=41c62d459c4e7bc4a04367eb80f45a8c29aa3baa +WEB_COMMITID=6c661268b9604b1d711cf702c8d5966c9ba6482b WEB_BRANCH=master From 7a592b2ff6be8cf7ada9529287b89114fb44045a Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Fri, 29 Apr 2022 15:50:25 +0200 Subject: [PATCH 6/7] change middleware version and web commit --- .drone.env | 2 +- .drone.star | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.env b/.drone.env index 7ac41b90960..1d1205fa954 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=b262ada63569e241f9cee451c23f267512fd48b2 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=6c661268b9604b1d711cf702c8d5966c9ba6482b +WEB_COMMITID=8420a49515254e17654ea9a32ba611696bf461b6 WEB_BRANCH=master diff --git a/.drone.star b/.drone.star index 381b53459c8..16542d0f7e5 100644 --- a/.drone.star +++ b/.drone.star @@ -18,7 +18,7 @@ OC_CI_NODEJS = "owncloudci/nodejs:%s" OC_CI_PHP = "owncloudci/php:%s" OC_CI_WAIT_FOR = "owncloudci/wait-for:latest" OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:latest" -OC_OC_TEST_MIDDLEWARE = "56940/owncloud-test-middleware:latest" +OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.6.0" OC_SERVER = "owncloud/server:10" OC_UBUNTU = "owncloud/ubuntu:18.04" OSIXIA_OPEN_LDAP = "osixia/openldap:latest" From 32260663de3e2e7da2ed8f6fb9191b3e6999a013 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Fri, 29 Apr 2022 17:10:40 +0200 Subject: [PATCH 7/7] back to webcommitID and add failed test to expected failures --- .drone.env | 2 +- tests/acceptance/expected-failures-webUI-on-OCIS-storage.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index 1d1205fa954..2bc45c22d32 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=b262ada63569e241f9cee451c23f267512fd48b2 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=8420a49515254e17654ea9a32ba611696bf461b6 +WEB_COMMITID=41c62d459c4e7bc4a04367eb80f45a8c29aa3baa WEB_BRANCH=master diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index b3a2909b077..e4b315e64da 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -472,3 +472,6 @@ Other free text and markdown formatting can be used elsewhere in the document if ### [publicLinkCreate.feature:172 is failing](https://github.com/owncloud/ocis/issues/3581) - [webUISharingPublicBasic/publicLinkCreate.feature:172](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#172) + +### [Creating group with problematic group name via graph api gives 500 error](https://github.com/owncloud/ocis/issues/3631) +- [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:41)