Merge remote-tracking branch 'origin/2.8'

1 files changed, 216 insertions, 338 deletions

diff --git a/.drone.star b/.drone.star
index 287ba6738..510c2021e 100644
--- a/.drone.star
+++ b/.drone.star
@@ -10,16 +10,16 @@ def main(ctx):
         "cron": ["translations-2-7"],
     }
     build_trigger = {
-         "ref": [
-            'refs/heads/master',
-            'refs/tags/v*',
-            'refs/pull/**',
+        "ref": [
+            "refs/heads/master",
+            "refs/tags/v*",
+            "refs/pull/**",
         ],
     }
     notification_trigger = {
-         "ref": [
-            'refs/heads/master',
-            'refs/tags/v*',
+        "ref": [
+            "refs/heads/master",
+            "refs/tags/v*",
         ],
     }
     pipelines = [
@@ -31,7 +31,7 @@ def main(ctx):
             trigger = build_trigger,
             depends_on = [],
         ),
-        # Build client and docs
+        # Build client
         build_and_test_client(
             ctx,
             "gcc",
@@ -49,14 +49,12 @@ def main(ctx):
             trigger = build_trigger,
         ),
         gui_tests(ctx, trigger = build_trigger),
-        build_client_docs(ctx),
         notification(
             name = "build",
             depends_on = [
                 "changelog",
                 "gcc-release-make",
                 "clang-debug-ninja",
-                "build-docs",
             ],
             trigger = notification_trigger,
         ),
@@ -73,7 +71,7 @@ def main(ctx):
             name = "translations",
             trigger = translations_trigger,
             depends_on = [
-                "translations-client"
+                "translations-client",
             ],
         ),
     ]
@@ -120,31 +118,31 @@ def build_and_test_client(ctx, c_compiler, cxx_compiler, build_type, generator,
             "arch": "amd64",
         },
         "steps": [
-            {
-                "name": "submodules",
-                "image": "docker:git",
-                "commands": [
-                    "git submodule update --init --recursive",
-                ],
-            }
-        ] +
-          build_client(ctx, c_compiler, cxx_compiler, build_type, generator, build_command, build_dir)+
-        [
-            {
-                "name": "ctest",
-                "image": "owncloudci/client",
-                "pull": "always",
-                "environment": {
-                    "LC_ALL": "C.UTF-8",
-                },
-                "commands": [
-                    'cd "' + build_dir + '"',
-                    "useradd -m -s /bin/bash tester",
-                    "chown -R tester:tester .",
-                    "su-exec tester ctest --output-on-failure -LE nodrone",
-                ],
-            },
-        ],
+                     {
+                         "name": "submodules",
+                         "image": "docker:git",
+                         "commands": [
+                             "git submodule update --init --recursive",
+                         ],
+                     },
+                 ] +
+                 build_client(ctx, c_compiler, cxx_compiler, build_type, generator, build_command, build_dir) +
+                 [
+                     {
+                         "name": "ctest",
+                         "image": "owncloudci/client",
+                         "pull": "always",
+                         "environment": {
+                             "LC_ALL": "C.UTF-8",
+                         },
+                         "commands": [
+                             'cd "' + build_dir + '"',
+                             "useradd -m -s /bin/bash tester",
+                             "chown -R tester:tester .",
+                             "su-exec tester ctest --output-on-failure -LE nodrone",
+                         ],
+                     },
+                 ],
         "trigger": trigger,
         "depends_on": depends_on,
     }
@@ -161,189 +159,71 @@ def gui_tests(ctx, trigger = {}, depends_on = []):
             "arch": "amd64",
         },
         "steps": [
-            {
-                "name": "submodules",
-                "image": "docker:git",
-                "commands": [
-                    "git submodule update --init --recursive",
-                ],
-            }
-        ] +
-          installCore('daily-master-qa') +
-          setupServerAndApp(2) +
-          fixPermissions() +
-          owncloudLog() +
-          build_client(ctx, "gcc", "g++", "Release", "Unix Makefiles", "make", build_dir)  +
-        [
-            {
-                "name": "GUItests",
-                "image": "owncloudci/squish:latest",
-                "pull": "always",
-                "environment": {
-                    "LICENSEKEY": from_secret("squish_license_server"),
-                    "CLIENT_REPO": "/drone/src/",
-                    "MIDDLEWARE_URL": "http://testmiddleware:3000/",
-                    "BACKEND_HOST": "http://owncloud/",
-                    "SERVER_INI": "/drone/src/test/gui/drone/server.ini",
-                    "SQUISH_PARAMETERS": "--retry 1",
-                },
-            },
-        ],
-        "services":
-            testMiddleware() +
-            owncloudService() +
-            databaseService(),
-
+                     {
+                         "name": "submodules",
+                         "image": "docker:git",
+                         "commands": [
+                             "git submodule update --init --recursive",
+                         ],
+                     },
+                 ] +
+                 installCore("daily-master-qa") +
+                 setupServerAndApp(2) +
+                 fixPermissions() +
+                 owncloudLog() +
+                 build_client(ctx, "gcc", "g++", "Release", "Unix Makefiles", "make", build_dir) +
+                 [
+                     {
+                         "name": "GUItests",
+                         "image": "owncloudci/squish:latest",
+                         "pull": "always",
+                         "environment": {
+                             "LICENSEKEY": from_secret("squish_license_server"),
+                             "CLIENT_REPO": "/drone/src/",
+                             "MIDDLEWARE_URL": "http://testmiddleware:3000/",
+                             "BACKEND_HOST": "http://owncloud/",
+                             "SERVER_INI": "/drone/src/test/gui/drone/server.ini",
+                             "SQUISH_PARAMETERS": "--retry 1",
+                         },
+                     },
+                 ],
+        "services": testMiddleware() +
+                    owncloudService() +
+                    databaseService(),
         "trigger": trigger,
         "depends_on": depends_on,
     }
 
 def build_client(ctx, c_compiler, cxx_compiler, build_type, generator, build_command, build_dir):
-  return [
-    {
-        "name": "cmake",
-        "image": "owncloudci/client",
-        "pull": "always",
-        "environment": {
-            "LC_ALL": "C.UTF-8",
-        },
-        "commands": [
-            'mkdir -p "' + build_dir + '"',
-            'cd "' + build_dir + '"',
-            'cmake -G"' + generator + '" -DCMAKE_C_COMPILER="' + c_compiler + '" -DCMAKE_CXX_COMPILER="' + cxx_compiler + '" -DCMAKE_BUILD_TYPE="' + build_type + '" -DBUILD_TESTING=1 ..',
-        ],
-    },
-    {
-        "name": build_command,
-        "image": "owncloudci/client",
-        "pull": "always",
-        "environment": {
-            "LC_ALL": "C.UTF-8",
-        },
-        "commands": [
-            'cd "' + build_dir + '"',
-            build_command + " -j4",
-        ],
-    }
-  ]
-
-
-def build_client_docs(ctx):
-    return {
-        "kind": "pipeline",
-        "name": "build-docs",
-        "platform": {
-            "os": "linux",
-            "arch": "amd64",
-        },
-        "steps": [
-            whenOnline({
-                "name": "cache-restore",
-                "image": "plugins/s3-cache:1",
-                "pull": "always",
-                "settings": {
-                    "endpoint": from_secret("cache_s3_endpoint"),
-                    "access_key": from_secret("cache_s3_access_key"),
-                    "secret_key": from_secret("cache_s3_secret_key"),
-                    "restore": True,
-                },
-            }),
-            {
-                "name": "docs-deps",
-                "image": "owncloudci/nodejs:11",
-                "pull": "always",
-                "commands": [
-                    "cd docs/",
-                    "yarn install",
-                ],
-            },
-            {
-                "name": "docs-validate",
-                "image": "owncloudci/nodejs:11",
-                "pull": "always",
-                "commands": [
-                    "cd docs/",
-                    "yarn validate",
-                ],
+    return [
+        {
+            "name": "cmake",
+            "image": "owncloudci/client",
+            "pull": "always",
+            "environment": {
+                "LC_ALL": "C.UTF-8",
             },
-            {
-                "name": "docs-build",
-                "image": "owncloudci/nodejs:11",
-                "pull": "always",
-                "commands": [
-                    "cd docs/",
-                    "yarn antora",
-                ],
-            },
-            {
-                "name": "docs-pdf",
-                "image": "owncloudci/asciidoctor:latest",
-                "pull": "always",
-                "commands": [
-                    "cd docs/",
-                    "make pdf",
-                ],
-            },
-            {
-                "name": "docs-artifacts",
-                "image": "owncloud/ubuntu:latest",
-                "pull": "always",
-                "commands": [
-                    "tree docs/public/",
-                ],
+            "commands": [
+                'mkdir -p "' + build_dir + '"',
+                'cd "' + build_dir + '"',
+                'cmake -G"' + generator + '" -DCMAKE_C_COMPILER="' + c_compiler + '" -DCMAKE_CXX_COMPILER="' + cxx_compiler + '" -DCMAKE_BUILD_TYPE="' + build_type + '" -DBUILD_TESTING=1 ..',
+            ],
+        },
+        {
+            "name": build_command,
+            "image": "owncloudci/client",
+            "pull": "always",
+            "environment": {
+                "LC_ALL": "C.UTF-8",
             },
-            whenOnline(whenPush({
-                "name": "cache-rebuild",
-                "image": "plugins/s3-cache:1",
-                "pull": "always",
-                "settings": {
-                    "endpoint": from_secret("cache_s3_endpoint"),
-                    "access_key": from_secret("cache_s3_access_key"),
-                    "secret_key": from_secret("cache_s3_secret_key"),
-                    "rebuild": True,
-                    "mount": "docs/cache",
-                },
-            })),
-            whenOnline(whenPush({
-                "name": "cache-flush",
-                "image": "plugins/s3-cache:1",
-                "pull": "always",
-                "settings": {
-                    "endpoint": from_secret("cache_s3_endpoint"),
-                    "access_key": from_secret("cache_s3_access_key"),
-                    "secret_key": from_secret("cache_s3_secret_key"),
-                    "flush": True,
-                    "flush_age": 14,
-                },
-            })),
-            whenOnline(whenPush({
-                "name": "upload-pdf",
-                "image": "plugins/s3-sync:1",
-                "pull": "always",
-                "environment": {
-                    "AWS_ACCESS_KEY_ID": from_secret("aws_access_key_id"),
-                    "AWS_SECRET_ACCESS_KEY": from_secret("aws_secret_access_key"),
-                },
-                "settings": {
-                    "bucket": "uploads",
-                    "endpoint": "https://doc.owncloud.com",
-                    "path_style": True,
-                    "source": "docs/build/",
-                    "target": "/deploy/",
-                    "delete": False,
-                },
-            })),
-        ],
-        "trigger": {
-            "ref": [
-                "refs/heads/master",
-                "refs/tags/**",
-                "refs/pull/**",
+            "commands": [
+                'cd "' + build_dir + '"',
+                build_command + " -j4",
             ],
         },
-    }
+    ]
 
-def  gui_tests_format():
+def gui_tests_format():
     return {
         "kind": "pipeline",
         "type": "docker",
@@ -354,93 +234,92 @@ def  gui_tests_format():
                 "image": "cytopia/black",
                 "pull": "always",
                 "commands": [
-                    'cd /drone/src/test/gui',
-                    'black --check --diff .',
+                    "cd /drone/src/test/gui",
+                    "black --check --diff .",
                 ],
             },
         ],
     }
 
-
 def changelog(ctx, trigger = {}, depends_on = []):
     repo_slug = ctx.build.source_repo if ctx.build.source_repo else ctx.repo.slug
     result = {
-        'kind': 'pipeline',
-        'type': 'docker',
-        'name': 'changelog',
-        'clone': {
-            'disable': True,
+        "kind": "pipeline",
+        "type": "docker",
+        "name": "changelog",
+        "clone": {
+            "disable": True,
         },
-        'steps': [
+        "steps": [
             {
-                'name': 'clone',
-                'image': 'plugins/git-action:1',
-                'pull': 'always',
-                'settings': {
-                    'actions': [
-                        'clone',
+                "name": "clone",
+                "image": "plugins/git-action:1",
+                "pull": "always",
+                "settings": {
+                    "actions": [
+                        "clone",
                     ],
-                    'remote': 'https://github.com/%s' % (repo_slug),
-                    'branch': ctx.build.source if ctx.build.event == 'pull_request' else 'master',
-                    'path': '/drone/src',
-                    'netrc_machine': 'github.com',
-                    'netrc_username': from_secret('github_username'),
-                    'netrc_password': from_secret('github_token'),
+                    "remote": "https://github.com/%s" % (repo_slug),
+                    "branch": ctx.build.source if ctx.build.event == "pull_request" else "master",
+                    "path": "/drone/src",
+                    "netrc_machine": "github.com",
+                    "netrc_username": from_secret("github_username"),
+                    "netrc_password": from_secret("github_token"),
                 },
             },
             {
-                'name': 'generate',
-                'image': 'toolhippie/calens:latest',
-                'pull': 'always',
-                'commands': [
-                    'calens >| CHANGELOG.md',
+                "name": "generate",
+                "image": "toolhippie/calens:latest",
+                "pull": "always",
+                "commands": [
+                    "calens >| CHANGELOG.md",
                 ],
             },
             {
-                'name': 'diff',
-                'image': 'owncloud/alpine:latest',
-                'pull': 'always',
-                'commands': [
-                    'git diff',
+                "name": "diff",
+                "image": "owncloud/alpine:latest",
+                "pull": "always",
+                "commands": [
+                    "git diff",
                 ],
             },
             {
-                'name': 'output',
-                'image': 'toolhippie/calens:latest',
-                'pull': 'always',
-                'commands': [
-                    'cat CHANGELOG.md',
+                "name": "output",
+                "image": "toolhippie/calens:latest",
+                "pull": "always",
+                "commands": [
+                    "cat CHANGELOG.md",
                 ],
             },
             {
-                'name': 'publish',
-                'image': 'plugins/git-action:1',
-                'pull': 'always',
-                'settings': {
-                    'actions': [
-                        'commit',
-                        'push',
+                "name": "publish",
+                "image": "plugins/git-action:1",
+                "pull": "always",
+                "settings": {
+                    "actions": [
+                        "commit",
+                        "push",
                     ],
-                    'message': 'Automated changelog update [skip ci]',
-                    'branch': 'master',
-                    'author_email': 'devops@owncloud.com',
-                    'author_name': 'ownClouders',
-                    'netrc_machine': 'github.com',
-                    'netrc_username': from_secret('github_username'),
-                    'netrc_password': from_secret('github_token'),
+                    "message": "Automated changelog update [skip ci]",
+                    "branch": "master",
+                    "author_email": "devops@owncloud.com",
+                    "author_name": "ownClouders",
+                    "netrc_machine": "github.com",
+                    "netrc_username": from_secret("github_username"),
+                    "netrc_password": from_secret("github_token"),
                 },
-                'when': {
-                    'ref': {
-                        'exclude': [
-                            'refs/pull/**',
-                            'refs/tags/**'
+                "when": {
+                    "ref": {
+                        "exclude": [
+                            "refs/pull/**",
+                            "refs/tags/**",
                         ],
                     },
                 },
             },
         ],
-        'trigger': trigger,
-        'depends_on': depends_on,
+        "trigger": trigger,
+        "depends_on": depends_on,
     }
 
     return result
@@ -539,105 +418,104 @@ def notification(name, depends_on = [], trigger = {}):
 
 def databaseService():
     service = {
-        'name': 'mysql',
-        'image': 'mysql:8.0',
-        'pull': 'always',
-        'environment': {
-            'MYSQL_USER': 'owncloud',
-            'MYSQL_PASSWORD': 'owncloud',
-            'MYSQL_DATABASE': 'owncloud',
-            'MYSQL_ROOT_PASSWORD': 'owncloud'
+        "name": "mysql",
+        "image": "mysql:8.0",
+        "pull": "always",
+        "environment": {
+            "MYSQL_USER": "owncloud",
+            "MYSQL_PASSWORD": "owncloud",
+            "MYSQL_DATABASE": "owncloud",
+            "MYSQL_ROOT_PASSWORD": "owncloud",
         },
-        'command': ['--default-authentication-plugin=mysql_native_password']
+        "command": ["--default-authentication-plugin=mysql_native_password"],
     }
     return [service]
 
 def installCore(version):
     stepDefinition = {
-        'name': 'install-core',
-        'image': 'owncloudci/core',
-        'pull': 'always',
-        'settings': {
-            'version': version,
-            'core_path': '/drone/src/server',
-            'db_type': 'mysql',
-            'db_name': 'owncloud',
-            'db_host': 'mysql',
-            'db_username': 'owncloud',
-            'db_password': 'owncloud'
-        }
+        "name": "install-core",
+        "image": "owncloudci/core",
+        "pull": "always",
+        "settings": {
+            "version": version,
+            "core_path": "/drone/src/server",
+            "db_type": "mysql",
+            "db_name": "owncloud",
+            "db_host": "mysql",
+            "db_username": "owncloud",
+            "db_password": "owncloud",
+        },
     }
     return [stepDefinition]
 
 def setupServerAndApp(logLevel):
     return [{
-        'name': 'setup-owncloud-server',
-        'image': 'owncloudci/php:7.4',
-        'pull': 'always',
-        'commands': [
-            'cd /drone/src/server/',
-            'php occ a:e testing',
-            'php occ config:system:set trusted_domains 1 --value=owncloud',
-            'php occ log:manage --level %s' % logLevel,
-            'php occ config:list',
-            'php occ config:system:set skeletondirectory --value=/var/www/owncloud/server/apps/testing/data/webUISkeleton',
-            'php occ config:system:set sharing.federation.allowHttpFallback --value=true --type=bool'
-        ]
+        "name": "setup-owncloud-server",
+        "image": "owncloudci/php:7.4",
+        "pull": "always",
+        "commands": [
+            "cd /drone/src/server/",
+            "php occ a:e testing",
+            "php occ config:system:set trusted_domains 1 --value=owncloud",
+            "php occ log:manage --level %s" % logLevel,
+            "php occ config:list",
+            "php occ config:system:set skeletondirectory --value=/var/www/owncloud/server/apps/testing/data/webUISkeleton",
+            "php occ config:system:set sharing.federation.allowHttpFallback --value=true --type=bool",
+        ],
     }]
 
-
 def owncloudService():
     return [{
-        'name': 'owncloud',
-        'image': 'owncloudci/php:7.4',
-        'pull': 'always',
-        'environment': {
-            'APACHE_WEBROOT': '/drone/src/server/',
+        "name": "owncloud",
+        "image": "owncloudci/php:7.4",
+        "pull": "always",
+        "environment": {
+            "APACHE_WEBROOT": "/drone/src/server/",
         },
-        'command': [
-            '/usr/local/bin/apachectl',
-            '-e',
-            'debug',
-            '-D',
-            'FOREGROUND'
-        ]
+        "command": [
+            "/usr/local/bin/apachectl",
+            "-e",
+            "debug",
+            "-D",
+            "FOREGROUND",
+        ],
     }]
 
 def testMiddleware():
     return [{
-        'name': 'testmiddleware',
-        'image': 'owncloudci/nodejs:14',
-        'pull': 'always',
-        'environment': {
-            'MIDDLEWARE_HOST': 'testmiddleware',
-            'BACKEND_HOST': 'http://owncloud'
+        "name": "testmiddleware",
+        "image": "owncloudci/nodejs:14",
+        "pull": "always",
+        "environment": {
+            "MIDDLEWARE_HOST": "testmiddleware",
+            "BACKEND_HOST": "http://owncloud",
         },
-        'commands': [
-            'git clone https://github.com/owncloud/owncloud-test-middleware.git /drone/src/middleware',
-            'cd /drone/src/middleware',
-            'yarn install',
-            'yarn start'
-        ]
+        "commands": [
+            "git clone https://github.com/owncloud/owncloud-test-middleware.git /drone/src/middleware",
+            "cd /drone/src/middleware",
+            "yarn install",
+            "yarn start",
+        ],
     }]
 
 def owncloudLog():
     return [{
-        'name': 'owncloud-log',
-        'image': 'owncloud/ubuntu:16.04',
-        'pull': 'always',
-        'detach': True,
-        'commands': [
-            'tail -f /drone/src/server/data/owncloud.log'
-        ]
+        "name": "owncloud-log",
+        "image": "owncloud/ubuntu:16.04",
+        "pull": "always",
+        "detach": True,
+        "commands": [
+            "tail -f /drone/src/server/data/owncloud.log",
+        ],
     }]
 
 def fixPermissions():
     return [{
-        'name': 'fix-permissions',
-        'image': 'owncloudci/php:7.4',
-        'pull': 'always',
-        'commands': [
-            'cd /drone/src/server',
-            'chown www-data * -R'
-        ]
+        "name": "fix-permissions",
+        "image": "owncloudci/php:7.4",
+        "pull": "always",
+        "commands": [
+            "cd /drone/src/server",
+            "chown www-data * -R",
+        ],
     }]