Merge pull request #9054 from owncloud/backport-pr-9039

[tests-only][full-ci] backport make function's return type in drone file similar
This commit is contained in:
Phil Davis
2024-05-03 10:07:33 +05:45
committed by GitHub
+20 -21
View File
@@ -238,18 +238,17 @@ def main(ctx):
pipelines = [] pipelines = []
build_release_helpers = [ build_release_helpers = \
changelog(), changelog() + \
docs(), docs() + \
licenseCheck(ctx), licenseCheck(ctx)
]
test_pipelines = \ test_pipelines = \
codestyle(ctx) + \ codestyle(ctx) + \
checkTestSuitesInExpectedFailures(ctx) + \ checkTestSuitesInExpectedFailures(ctx) + \
buildWebCache(ctx) + \ buildWebCache(ctx) + \
getGoBinForTesting(ctx) + \ getGoBinForTesting(ctx) + \
[buildOcisBinaryForTesting(ctx)] + \ buildOcisBinaryForTesting(ctx) + \
checkStarlark() + \ checkStarlark() + \
build_release_helpers + \ build_release_helpers + \
testOcisAndUploadResults(ctx) + \ testOcisAndUploadResults(ctx) + \
@@ -543,7 +542,7 @@ def scanOcis(ctx):
} }
def buildOcisBinaryForTesting(ctx): def buildOcisBinaryForTesting(ctx):
return { return [{
"kind": "pipeline", "kind": "pipeline",
"type": "docker", "type": "docker",
"name": "build_ocis_binary_for_testing", "name": "build_ocis_binary_for_testing",
@@ -563,7 +562,7 @@ def buildOcisBinaryForTesting(ctx):
], ],
}, },
"volumes": [pipelineVolumeGo], "volumes": [pipelineVolumeGo],
} }]
def uploadScanResults(ctx): def uploadScanResults(ctx):
sonar_env = { sonar_env = {
@@ -817,7 +816,7 @@ def localApiTestPipeline(ctx):
localApiTests(suite, storage, params["extraEnvironment"]) + localApiTests(suite, storage, params["extraEnvironment"]) +
logRequests(), logRequests(),
"services": emailService() if params["emailNeeded"] else [] + clamavService() if params["antivirusNeeded"] else [], "services": emailService() if params["emailNeeded"] else [] + clamavService() if params["antivirusNeeded"] else [],
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/stable-*",
@@ -877,7 +876,7 @@ def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4):
], ],
}, },
], ],
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/stable-*",
@@ -984,7 +983,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4):
}, },
] + ] +
validatorTests, validatorTests,
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/stable-*",
@@ -1033,7 +1032,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
] + ] +
logRequests(), logRequests(),
"services": redisForOCStorage(storage), "services": redisForOCStorage(storage),
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/stable-*",
@@ -1157,7 +1156,7 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o
"name": "uploads", "name": "uploads",
"temp": {}, "temp": {},
}], }],
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx) + buildWebCache(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/stable-*",
@@ -1242,7 +1241,7 @@ def e2eTests(ctx):
"type": "docker", "type": "docker",
"name": "e2e-tests-%s" % name, "name": "e2e-tests-%s" % name,
"steps": steps, "steps": steps,
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx) + buildWebCache(ctx)),
"trigger": e2e_trigger, "trigger": e2e_trigger,
"volumes": e2e_volumes, "volumes": e2e_volumes,
}) })
@@ -1564,7 +1563,7 @@ def licenseCheck(ctx):
"target": target, "target": target,
} }
return { return [{
"kind": "pipeline", "kind": "pipeline",
"type": "docker", "type": "docker",
"name": "check-licenses", "name": "check-licenses",
@@ -1664,7 +1663,7 @@ def licenseCheck(ctx):
], ],
}, },
"volumes": [pipelineVolumeGo], "volumes": [pipelineVolumeGo],
} }]
def releaseDockerManifest(): def releaseDockerManifest():
return { return {
@@ -1700,7 +1699,7 @@ def releaseDockerManifest():
} }
def changelog(): def changelog():
return { return [{
"kind": "pipeline", "kind": "pipeline",
"type": "docker", "type": "docker",
"name": "changelog", "name": "changelog",
@@ -1766,7 +1765,7 @@ def changelog():
"refs/pull/**", "refs/pull/**",
], ],
}, },
} }]
def releaseDockerReadme(ctx): def releaseDockerReadme(ctx):
return { return {
@@ -1802,7 +1801,7 @@ def releaseDockerReadme(ctx):
} }
def docs(): def docs():
return { return [{
"kind": "pipeline", "kind": "pipeline",
"type": "docker", "type": "docker",
"name": "docs", "name": "docs",
@@ -1871,7 +1870,7 @@ def docs():
"refs/pull/**", "refs/pull/**",
], ],
}, },
} }]
def makeNodeGenerate(module): def makeNodeGenerate(module):
if module == "": if module == "":
@@ -2582,7 +2581,7 @@ def litmus(ctx, storage):
}, },
], ],
"services": redisForOCStorage(storage), "services": redisForOCStorage(storage),
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames(buildOcisBinaryForTesting(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/stable-*",