From a3128cb26c18f088f31ae7a599597c76b0e43b6d Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 20 Aug 2020 12:19:19 +0545 Subject: [PATCH 01/11] [tests-only] advance commit id of ocis & phoenix --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 7ac566d8828..dead4579397 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ def main(ctx): before = [ testing(ctx), - UITests(ctx, 'master', 'd6ed9f3e60f5cfc4eeb261d91a6d1607045904ee', 'master', '0ba693cea50cafdb7e6b4e3f559a70cbd4d04bbe') + UITests(ctx, 'master', 'a7ce0c8172f445d9b945d4c4bf531f1271926df6', 'master', '0075dbd7b14360de203ec2a327c6b3f5c5844364') ] stages = [ From e2544b2b4d5d02e0139eacd41d6f8d885325dfb5 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 20 Aug 2020 12:36:38 +0545 Subject: [PATCH 02/11] delete LDAP usages from CI pipelines --- .drone.star | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.drone.star b/.drone.star index dead4579397..475fb3ecae5 100644 --- a/.drone.star +++ b/.drone.star @@ -322,11 +322,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'pull': 'always', 'detach': True, 'environment' : { - 'REVA_LDAP_HOSTNAME': 'ldap', - 'REVA_LDAP_PORT': 636, - 'REVA_LDAP_BIND_PASSWORD': 'admin', - 'REVA_LDAP_BIND_DN': 'cn=admin,dc=owncloud,dc=com', - 'REVA_LDAP_BASE_DN': 'dc=owncloud,dc=com', 'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/', 'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root', 'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data', @@ -338,10 +333,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ui/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', 'KONNECTD_TLS': 'true', - 'LDAP_URI': 'ldap://ldap', - 'LDAP_BINDDN': 'cn=admin,dc=owncloud,dc=com', - 'LDAP_BINDPW': 'admin', - 'LDAP_BASEDN': 'dc=owncloud,dc=com', 'OCIS_CONFIG_FILE': '/drone/src/ui/tests/config/drone/proxy-config.json' }, 'commands': [ @@ -368,11 +359,9 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'SERVER_HOST': 'https://ocis-server:9200', 'BACKEND_HOST': 'https://ocis-server:9200', 'RUN_ON_OCIS': 'true', - 'RUN_WITH_LDAP': 'true', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva', 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', 'PHOENIX_CONFIG': '/drone/src/ui/tests/config/drone/ocis-config.json', - 'LDAP_SERVER_URL': 'ldap://ldap', 'TEST_TAGS': 'not @skipOnOCIS and not @skip', 'LOCAL_UPLOAD_DIR': '/uploads', 'PHOENIX_PATH': '/srv/app/phoenix', @@ -403,18 +392,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): }, ], 'services': [ - { - 'name': 'ldap', - 'image': 'osixia/openldap:1.3.0', - 'pull': 'always', - 'environment': { - 'LDAP_DOMAIN': 'owncloud.com', - 'LDAP_ORGANISATION': 'ownCloud', - 'LDAP_ADMIN_PASSWORD': 'admin', - 'LDAP_TLS_VERIFY_CLIENT': 'never', - 'HOSTNAME': 'ldap' - }, - }, { 'name': 'redis', 'image': 'webhippie/redis', From eef08e34e5efdfe6fa36b99776ca7b34fda8f1d7 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 20 Aug 2020 14:50:44 +0545 Subject: [PATCH 03/11] use basic-roles-support as ocis branch for now --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 475fb3ecae5..1eb825c91e1 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ def main(ctx): before = [ testing(ctx), - UITests(ctx, 'master', 'a7ce0c8172f445d9b945d4c4bf531f1271926df6', 'master', '0075dbd7b14360de203ec2a327c6b3f5c5844364') + UITests(ctx, 'basic-roles-support', '', 'master', '0075dbd7b14360de203ec2a327c6b3f5c5844364') ] stages = [ From 8e702c621f8405d50c184efd1f6cbf15ab0f641e Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 20 Aug 2020 15:11:34 +0545 Subject: [PATCH 04/11] add more settings --- .drone.star | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.star b/.drone.star index 1eb825c91e1..6623ed90286 100644 --- a/.drone.star +++ b/.drone.star @@ -328,6 +328,10 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'REVA_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/', 'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379', 'REVA_OIDC_ISSUER': 'https://ocis-server:9200', + 'PROXY_OIDC_ISSUER': 'https://ocis-server:9200', + 'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data', + 'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data', + 'REVA_FRONTEND_URL': 'https://ocis-server:9200', 'PHOENIX_WEB_CONFIG': '/drone/src/ui/tests/config/drone/ocis-config.json', 'PHOENIX_ASSET_PATH': '/srv/app/phoenix/dist', 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ui/tests/config/drone/identifier-registration.yml', From a531cefac94bd4d88d99367d6dc9a3af0a3faff5 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 20 Aug 2020 16:25:34 +0545 Subject: [PATCH 05/11] add 'REVA_LDAP_IDP' setting --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index 6623ed90286..38f6be3ba41 100644 --- a/.drone.star +++ b/.drone.star @@ -332,6 +332,7 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data', 'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data', 'REVA_FRONTEND_URL': 'https://ocis-server:9200', + 'REVA_LDAP_IDP': 'https://ocis-server:9200', 'PHOENIX_WEB_CONFIG': '/drone/src/ui/tests/config/drone/ocis-config.json', 'PHOENIX_ASSET_PATH': '/srv/app/phoenix/dist', 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ui/tests/config/drone/identifier-registration.yml', From 05b4f6b4fd4c1c2f46305297ce2c8ae443c84d69 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 21 Aug 2020 11:20:43 +0545 Subject: [PATCH 06/11] use build in phoenix --- .drone.star | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.star b/.drone.star index 38f6be3ba41..0fe85d51700 100644 --- a/.drone.star +++ b/.drone.star @@ -334,7 +334,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'REVA_FRONTEND_URL': 'https://ocis-server:9200', 'REVA_LDAP_IDP': 'https://ocis-server:9200', 'PHOENIX_WEB_CONFIG': '/drone/src/ui/tests/config/drone/ocis-config.json', - 'PHOENIX_ASSET_PATH': '/srv/app/phoenix/dist', 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ui/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', 'KONNECTD_TLS': 'true', From 3a2699149f88b6b9f4c7e7be81f74895f14720fe Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 21 Aug 2020 11:52:36 +0545 Subject: [PATCH 07/11] don't use the proxy config file --- .drone.star | 1 - ui/tests/config/drone/proxy-config.json | 73 ------------------------- 2 files changed, 74 deletions(-) delete mode 100644 ui/tests/config/drone/proxy-config.json diff --git a/.drone.star b/.drone.star index 0fe85d51700..ae5729931cf 100644 --- a/.drone.star +++ b/.drone.star @@ -337,7 +337,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ui/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', 'KONNECTD_TLS': 'true', - 'OCIS_CONFIG_FILE': '/drone/src/ui/tests/config/drone/proxy-config.json' }, 'commands': [ 'mkdir -p /srv/app/tmp/reva', diff --git a/ui/tests/config/drone/proxy-config.json b/ui/tests/config/drone/proxy-config.json deleted file mode 100644 index c6cde69e7e0..00000000000 --- a/ui/tests/config/drone/proxy-config.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "reva" - } - }, - "policies": [ - { - "name": "reva", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data/", - "backend": "http://localhost:9164" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/api/v0/greet", - "backend": "http://hello:9105" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://localhost:9181" - } - ] - } - ] -} From ea203e16bff0ea0d9801c5a0c7b131a460601978 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 21 Aug 2020 12:02:34 +0545 Subject: [PATCH 08/11] delete unnedded build steps --- .drone.star | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.star b/.drone.star index ae5729931cf..d3ec6aec58f 100644 --- a/.drone.star +++ b/.drone.star @@ -378,8 +378,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'git checkout %s' % (phoenixCommitId), 'cp -r /srv/app/phoenix/tests/acceptance/filesForUpload/* /uploads', 'yarn install-all', - 'yarn dist', - 'cp -r /drone/src/ui/tests/config/drone/ocis-config.json /srv/app/phoenix/dist/config.json', 'cd /drone/src', 'yarn install --all', 'make test-acceptance-webui' From db68531e542f0a86862e2e0f7c7014b86da8a162 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 21 Aug 2020 12:24:17 +0545 Subject: [PATCH 09/11] delete KONNECTD_TLS --- .drone.star | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.star b/.drone.star index d3ec6aec58f..b1e5c957863 100644 --- a/.drone.star +++ b/.drone.star @@ -336,7 +336,6 @@ def UITests(ctx, ocisBranch, ocisCommitId, phoenixBranch, phoenixCommitId): 'PHOENIX_WEB_CONFIG': '/drone/src/ui/tests/config/drone/ocis-config.json', 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ui/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', - 'KONNECTD_TLS': 'true', }, 'commands': [ 'mkdir -p /srv/app/tmp/reva', From 5e66bf645c72f48e69b3019d151c4902d40fccec Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 21 Aug 2020 12:25:35 +0545 Subject: [PATCH 10/11] make build also depend on UI tests --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index b1e5c957863..6ad3a749ae3 100644 --- a/.drone.star +++ b/.drone.star @@ -265,6 +265,7 @@ def docker(ctx, arch): ], 'depends_on': [ 'testing', + 'UiTests', ], 'trigger': { 'ref': [ From 2aa66bf041e7add18f6ccc8bbeeb36ada334f811 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 21 Aug 2020 14:55:52 +0545 Subject: [PATCH 11/11] use newest ocis master commit --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 6ad3a749ae3..db38894b512 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ def main(ctx): before = [ testing(ctx), - UITests(ctx, 'basic-roles-support', '', 'master', '0075dbd7b14360de203ec2a327c6b3f5c5844364') + UITests(ctx, 'master', '5b8438dacc92270bf2fabafb78d6dd54a0b04ecb', 'master', '0075dbd7b14360de203ec2a327c6b3f5c5844364') ] stages = [