Merge pull request #156 from owncloud/update-drone-star-20210905

Update .drone.star and drop PHP 7.2

.drone.star

@@ -21,15 +21,14 @@ config = {
     "phpunit": {
         "withCoverage": {
             "phpVersions": [
-                "7.2",
+                "7.3",
             ],
             "databases": [
                 "mysql:8.0",
             ],
         },
         "withoutCoverage": {
             "phpVersions": [
-                "7.3",
                 "7.4",
             ],
             "databases": [
@@ -91,7 +90,7 @@ def main(ctx):
     return before + coverageTests + afterCoverageTests + nonCoverageTests + stages + after
 
 def beforePipelines(ctx):
-    return codestyle(ctx) + jscodestyle(ctx) + checkForRecentBuilds(ctx) + phpstan(ctx) + phan(ctx) + checkStarlark()
+    return codestyle(ctx) + jscodestyle(ctx) + checkForRecentBuilds(ctx) + phpstan(ctx) + phan(ctx) + phplint(ctx) + checkStarlark()
 
 def coveragePipelines(ctx):
     # All unit test pipelines that have coverage or other test analysis reported
@@ -138,7 +137,7 @@ def codestyle(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
     }
 
     if "defaults" in config:
@@ -303,9 +302,10 @@ def phpstan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
         "logLevel": "2",
         "extraApps": {},
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -345,7 +345,7 @@ def phpstan(ctx):
                 "steps": installCore(ctx, "daily-master-qa", "sqlite", False) +
                          installApp(ctx, phpVersion) +
                          installExtraApps(phpVersion, params["extraApps"]) +
-                         setupServerAndApp(ctx, phpVersion, params["logLevel"]) +
+                         setupServerAndApp(ctx, phpVersion, params["logLevel"], False, params["enableApp"]) +
                          [
                              {
                                  "name": "phpstan",
@@ -379,7 +379,7 @@ def phan(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2", "7.3", "7.4"],
+        "phpVersions": ["7.3", "7.4"],
     }
 
     if "defaults" in config:
@@ -450,7 +450,7 @@ def build(ctx):
         return pipelines
 
     default = {
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.3"],
         "commands": [
             "make dist",
         ],
@@ -547,6 +547,7 @@ def javascript(ctx, withCoverage):
         "extraCommandsBeforeTestRun": [],
         "extraTeardown": [],
         "skip": False,
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -588,12 +589,12 @@ def javascript(ctx, withCoverage):
         },
         "steps": installCore(ctx, "daily-master-qa", "sqlite", False) +
                  installApp(ctx, "7.4") +
-                 setupServerAndApp(ctx, "7.4", params["logLevel"]) +
+                 setupServerAndApp(ctx, "7.4", params["logLevel"], False, params["enableApp"]) +
                  params["extraSetup"] +
                  [
                      {
                          "name": "js-tests",
-                         "image": "owncloudci/php:8.0",
+                         "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
                          "pull": "always",
                          "environment": params["extraEnvironment"],
                          "commands": params["extraCommandsBeforeTestRun"] + [
@@ -648,7 +649,7 @@ def phpTests(ctx, testType, withCoverage):
     errorFound = False
 
     default = {
-        "phpVersions": ["7.2", "7.3", "7.4"],
+        "phpVersions": ["7.3", "7.4"],
         "databases": [
             "sqlite",
             "mariadb:10.2",
@@ -668,6 +669,7 @@ def phpTests(ctx, testType, withCoverage):
         "extraApps": {},
         "extraTeardown": [],
         "skip": False,
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -760,7 +762,7 @@ def phpTests(ctx, testType, withCoverage):
                     "steps": installCore(ctx, "daily-master-qa", db, False) +
                              installApp(ctx, phpVersion) +
                              installExtraApps(phpVersion, params["extraApps"]) +
-                             setupServerAndApp(ctx, phpVersion, params["logLevel"]) +
+                             setupServerAndApp(ctx, phpVersion, params["logLevel"], False, params["enableApp"]) +
                              setupCeph(params["cephS3"]) +
                              setupScality(params["scalityS3"]) +
                              params["extraSetup"] +
@@ -844,7 +846,7 @@ def acceptance(ctx):
     default = {
         "servers": ["daily-master-qa", "latest"],
         "browsers": ["chrome"],
-        "phpVersions": ["7.2"],
+        "phpVersions": ["7.4"],
         "databases": ["mariadb:10.2"],
         "esVersions": ["none"],
         "federatedServerNeeded": False,
@@ -874,6 +876,7 @@ def acceptance(ctx):
         "debugSuites": [],
         "skipExceptParts": [],
         "earlyFail": True,
+        "enableApp": True,
     }
 
     if "defaults" in config:
@@ -924,7 +927,7 @@ def acceptance(ctx):
                 params["extraSetup"] = [
                     {
                         "name": "configure-app",
-                        "image": "owncloudci/php:7.2",
+                        "image": "owncloudci/php:7.4",
                         "pull": "always",
                         "commands": [
                             "cd /var/www/owncloud/server/apps/files_primary_s3",
@@ -1090,7 +1093,7 @@ def acceptance(ctx):
                              (installFederated(testConfig["server"], testConfig["phpVersion"], testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
                              installApp(ctx, testConfig["phpVersion"]) +
                              installExtraApps(testConfig["phpVersion"], testConfig["extraApps"]) +
-                             setupServerAndApp(ctx, testConfig["phpVersion"], testConfig["logLevel"], testConfig["federatedServerNeeded"]) +
+                             setupServerAndApp(ctx, testConfig["phpVersion"], testConfig["logLevel"], testConfig["federatedServerNeeded"], params["enableApp"]) +
                              owncloudLog("server") +
                              setupCeph(testConfig["cephS3"]) +
                              setupScality(testConfig["scalityS3"]) +
@@ -1387,10 +1390,11 @@ def elasticSearchService(esVersion):
 
     return [{
         "name": "elasticsearch",
-        "image": "webhippie/elasticsearch:%s" % esVersion,
+        "image": "owncloudops/elasticsearch:%s" % esVersion,
         "pull": "always",
         "environment": {
-            "ELASTICSEARCH_PLUGINS_INSTALL": "ingest-attachment",
+            "ELASTICSEARCH_ROOT_LOG_LEVEL": "warn",
+            "ELASTICSEARCH_BOOTSTRAP_MEMORY_LOCK": "false",
         },
     }]
 
@@ -1503,6 +1507,13 @@ def getDbDatabase(db):
 
     return "owncloud"
 
+def getNodeJsVersion():
+    if "nodeJsVersion" not in config:
+        # We use nodejs 14 as the default
+        return "14"
+    else:
+        return config["nodeJsVersion"]
+
 def cacheRestore():
     return [{
         "name": "cache-restore",
@@ -1619,7 +1630,23 @@ def installApp(ctx, phpVersion):
     if "appInstallCommand" not in config:
         return []
 
-    return [{
+    if "buildJsDeps" not in config:
+        installJsDeps = False
+    else:
+        installJsDeps = config["buildJsDeps"]
+
+    return [
+        {
+            "name": "install-app-js-%s" % config["app"],
+            "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
+            "pull": "always",
+            "commands": [
+                "cd /var/www/owncloud/server/apps/%s" % config["app"],
+                "make install-js-deps",
+                "make build-dev",
+            ],
+        },
+    ] if installJsDeps else [] + [{
         "name": "install-app-%s" % ctx.repo.name,
         "image": "owncloudci/php:%s" % phpVersion,
         "pull": "always",
@@ -1629,15 +1656,15 @@ def installApp(ctx, phpVersion):
         ],
     }]
 
-def setupServerAndApp(ctx, phpVersion, logLevel, federatedServerNeeded = False):
+def setupServerAndApp(ctx, phpVersion, logLevel, federatedServerNeeded = False, enableApp = True):
     return [{
         "name": "setup-server-%s" % ctx.repo.name,
         "image": "owncloudci/php:%s" % phpVersion,
         "pull": "always",
         "commands": [
             "cd %s" % dir["server"],
             "php occ a:l",
-            "php occ a:e %s" % ctx.repo.name,
+            "php occ a:e %s" % ctx.repo.name if enableApp else "",
             "php occ a:e testing",
             "php occ a:l",
             "php occ config:system:set trusted_domains 1 --value=server",
@@ -1664,7 +1691,7 @@ def setupCeph(serviceParams):
 
     return [{
         "name": "setup-ceph",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": setupCommands + ([
             "./apps/files_primary_s3/tests/drone/create-bucket.sh",
@@ -1692,7 +1719,7 @@ def setupScality(serviceParams):
 
     return [{
         "name": "setup-scality",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": setupCommands + ([
             "php occ s3:create-bucket owncloud --accept-warning",
@@ -1707,7 +1734,7 @@ def setupElasticSearch(esVersion):
 
     return [{
         "name": "setup-es",
-        "image": "owncloudci/php:7.2",
+        "image": "owncloudci/php:7.4",
         "pull": "always",
         "commands": [
             "cd %s" % dir["server"],
@@ -1946,3 +1973,60 @@ def checkStarlark():
             ],
         },
     }]
+
+def phplint(ctx):
+    pipelines = []
+
+    if "phplint" not in config:
+        return pipelines
+
+    if type(config["phplint"]) == "bool":
+        if not config["phplint"]:
+            return pipelines
+
+    result = {
+        "kind": "pipeline",
+        "type": "docker",
+        "name": "lint-test",
+        "workspace": {
+            "base": "/var/www/owncloud",
+            "path": "server/apps/%s" % ctx.repo.name,
+        },
+        "steps": installNPM() +
+                 lintTest(),
+        "depends_on": [],
+        "trigger": {
+            "ref": [
+                "refs/heads/master",
+                "refs/tags/**",
+                "refs/pull/**",
+            ],
+        },
+    }
+
+    for branch in config["branches"]:
+        result["trigger"]["ref"].append("refs/heads/%s" % branch)
+
+    pipelines.append(result)
+
+    return pipelines
+
+def installNPM():
+    return [{
+        "name": "npm-install",
+        "image": "owncloudci/nodejs:%s" % getNodeJsVersion(),
+        "pull": "always",
+        "commands": [
+            "yarn install --frozen-lockfile",
+        ],
+    }]
+
+def lintTest():
+    return [{
+        "name": "lint-test",
+        "image": "owncloudci/php:7.4",
+        "pull": "always",
+        "commands": [
+            "make test-lint",
+        ],
+    }]

Makefile

@@ -3,9 +3,6 @@
 SHELL := /bin/bash
 
 COMPOSER_BIN := $(shell command -v composer 2> /dev/null)
-ifndef COMPOSER_BIN
-    $(error composer is not available on your system, please install composer)
-endif
 
 app_name=firstrunwizard
 project_directory=$(CURDIR)/../$(app_name)
@@ -177,4 +174,4 @@ vendor-bin/behat/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/behat/com
 	composer bin behat install --no-progress
 
 vendor-bin/behat/composer.lock: vendor-bin/behat/composer.json
-	@echo behat composer.lock is not up to date.
+	@echo behat composer.lock is not up to date.

composer.json

@@ -2,7 +2,7 @@
   "name": "owncloud/firstrunwizard",
   "config" : {
     "platform": {
-      "php": "7.1"
+      "php": "7.3"
     }
   },
   "require": {

sonar-project.properties

@@ -29,5 +29,5 @@ sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH}
 sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY}
 
 # Properties specific to language plugins:
-sonar.php.coverage.reportPaths=results/clover-phpunit-php7.2-mysql8.0.xml
+sonar.php.coverage.reportPaths=results/clover-phpunit-php7.3-mysql8.0.xml
 sonar.javascript.lcov.reportPaths=results/lcov.info