From 4d0d0f2a87782cabe6e867ae28d7542f735b1cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Tue, 18 Mar 2025 11:09:20 +0100 Subject: [PATCH] Add storage to the pipeline name --- .woodpecker.star | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.woodpecker.star b/.woodpecker.star index c9f816f08..531a7c9e9 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -924,7 +924,7 @@ def localApiTestPipeline(ctx): for storage in params["storages"]: for run_with_remote_php in params["withRemotePhp"]: pipeline = { - "name": "%s-%s%s" % ("CLI" if name.startswith("cli") else "API", name, "-withoutRemotePhp" if not run_with_remote_php else ""), + "name": "%s-%s%s-%s" % ("CLI" if name.startswith("cli") else "API", name, "-withoutRemotePhp" if not run_with_remote_php else "", storage), "steps": restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) + (tikaService() if params["tikaNeeded"] else []) + (waitForServices("online-offices", ["collabora:9980", "onlyoffice:443", "fakeoffice:8080"]) if params["collaborationServiceNeeded"] else []) + @@ -990,7 +990,7 @@ def localApiTests(ctx, name, suites, storage = "decomposed", extra_environment = def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4): return { - "name": "cs3ApiTests", + "name": "cs3ApiTests-%s" % storage, "steps": restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) + opencloudServer(storage, accounts_hash_difficulty, [], [], "cs3api_validator") + [ @@ -1092,7 +1092,7 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = }) return { - "name": "wopiValidatorTests-%s" % wopiServerType, + "name": "wopiValidatorTests-%s-%s" % (wopiServerType, storage), "services": fakeOffice(), "steps": restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) + waitForServices("fake-office", ["fakeoffice:8080"]) + @@ -1144,7 +1144,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, with_remote_php = Fa expected_failures_file = "%s/expected-failures-API-on-decomposed-storage.md" % (test_dir) return { - "name": "Core-API-Tests-%s%s" % (part_number, "-withoutRemotePhp" if not with_remote_php else ""), + "name": "Core-API-Tests-%s%s-%s" % (part_number, "-withoutRemotePhp" if not with_remote_php else "", storage), "steps": restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) + opencloudServer(storage, accounts_hash_difficulty, with_wrapper = True) + [ @@ -1308,7 +1308,7 @@ def e2eTestPipeline(ctx): "bash run-e2e.sh %s --run-part %d" % (e2e_args, run_part), ] pipelines.append({ - "name": "e2e-tests-%s-%s" % (name, run_part), + "name": "e2e-tests-%s-%s-%s" % (name, run_part, storage), "steps": steps_before + [run_e2e] + steps_after, "depends_on": getPipelineNames(buildOpencloudBinaryForTesting(ctx) + buildWebCache(ctx)), "when": e2e_trigger, @@ -1316,7 +1316,7 @@ def e2eTestPipeline(ctx): else: step_e2e["commands"].append("bash run-e2e.sh %s" % e2e_args) pipelines.append({ - "name": "e2e-tests-%s" % name, + "name": "e2e-tests-%s-%s" % (name, storage), "steps": steps_before + [step_e2e] + steps_after, "depends_on": getPipelineNames(buildOpencloudBinaryForTesting(ctx) + buildWebCache(ctx)), "when": e2e_trigger, @@ -2142,6 +2142,7 @@ def opencloudServer(storage = "decomposed", accounts_hash_difficulty = 4, volume wrapper_commands = [ "make -C %s build" % dirs["ocWrapper"], + "env", "%s/bin/ocwrapper serve --bin %s --url %s --admin-username admin --admin-password admin" % (dirs["ocWrapper"], dirs["opencloudBin"], environment["OC_URL"]), ]