diff --git a/.drone.star b/.drone.star index 1638cafb68..fabea382b7 100644 --- a/.drone.star +++ b/.drone.star @@ -247,18 +247,17 @@ def main(ctx): pipelines = [] - build_release_helpers = [ - changelog(), - docs(), - licenseCheck(ctx), - ] + build_release_helpers = \ + changelog() + \ + docs() + \ + licenseCheck(ctx) test_pipelines = \ codestyle(ctx) + \ checkTestSuitesInExpectedFailures(ctx) + \ buildWebCache(ctx) + \ getGoBinForTesting(ctx) + \ - [buildOcisBinaryForTesting(ctx)] + \ + buildOcisBinaryForTesting(ctx) + \ checkStarlark() + \ build_release_helpers + \ testOcisAndUploadResults(ctx) + \ @@ -553,7 +552,7 @@ def scanOcis(ctx): } def buildOcisBinaryForTesting(ctx): - return { + return [{ "kind": "pipeline", "type": "docker", "name": "build_ocis_binary_for_testing", @@ -573,7 +572,7 @@ def buildOcisBinaryForTesting(ctx): ], }, "volumes": [pipelineVolumeGo], - } + }] def uploadScanResults(ctx): sonar_env = { @@ -827,7 +826,7 @@ def localApiTestPipeline(ctx): localApiTests(suite, storage, params["extraEnvironment"]) + logRequests(), "services": emailService() if params["emailNeeded"] else [] + clamavService() if params["antivirusNeeded"] else [], - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)), "trigger": { "ref": [ "refs/heads/master", @@ -887,7 +886,7 @@ def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4): ], }, ], - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)), "trigger": { "ref": [ "refs/heads/master", @@ -1023,7 +1022,7 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = }, ] + validatorTests, - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)), "trigger": { "ref": [ "refs/heads/master", @@ -1072,7 +1071,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac ] + logRequests(), "services": redisForOCStorage(storage), - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)), "trigger": { "ref": [ "refs/heads/master", @@ -1196,7 +1195,7 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o "name": "uploads", "temp": {}, }], - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx) + buildWebCache(ctx)), "trigger": { "ref": [ "refs/heads/master", @@ -1303,7 +1302,7 @@ def e2eTestPipeline(ctx): "type": "docker", "name": "e2e-tests-%s-%s" % (name, run_part), "steps": steps_before + [run_e2e] + steps_after, - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx) + buildWebCache(ctx)), "trigger": e2e_trigger, "volumes": e2e_volumes, }) @@ -1314,7 +1313,7 @@ def e2eTestPipeline(ctx): "type": "docker", "name": "e2e-tests-%s" % name, "steps": steps_before + [step_e2e] + steps_after, - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx) + buildWebCache(ctx)), "trigger": e2e_trigger, "volumes": e2e_volumes, }) @@ -1638,7 +1637,7 @@ def licenseCheck(ctx): "target": target, } - return { + return [{ "kind": "pipeline", "type": "docker", "name": "check-licenses", @@ -1740,7 +1739,7 @@ def licenseCheck(ctx): ], }, "volumes": [pipelineVolumeGo], - } + }] def releaseDockerManifest(): return { @@ -1777,7 +1776,7 @@ def releaseDockerManifest(): } def changelog(): - return { + return [{ "kind": "pipeline", "type": "docker", "name": "changelog", @@ -1843,7 +1842,7 @@ def changelog(): "refs/pull/**", ], }, - } + }] def releaseDockerReadme(ctx): return { @@ -1880,7 +1879,7 @@ def releaseDockerReadme(ctx): } def docs(): - return { + return [{ "kind": "pipeline", "type": "docker", "name": "docs", @@ -1949,7 +1948,7 @@ def docs(): "refs/pull/**", ], }, - } + }] def makeNodeGenerate(module): if module == "": @@ -2676,7 +2675,7 @@ def litmus(ctx, storage): }, ], "services": redisForOCStorage(storage), - "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), + "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)), "trigger": { "ref": [ "refs/heads/master",