From d77c83bdbe3e5fd63c29180e15dbe56877e4eab4 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 7 Jul 2021 11:42:03 +0545 Subject: [PATCH] Always run minimal web UI test pipeline --- .drone.star | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index d9b757888..bac2e3181 100644 --- a/.drone.star +++ b/.drone.star @@ -530,9 +530,13 @@ def uiTests(ctx): for runPart in range(1, numberOfParts + 1): if (not debugPartsEnabled or (debugPartsEnabled and runPart in skipExceptParts)): pipelines.append(uiTestPipeline(ctx, "", earlyFail, runPart, numberOfParts)) - return pipelines - else: - return [uiTestPipeline(ctx, filterTags, earlyFail)] + + # For ordinary PRs, always run the "minimal" UI test pipeline + # That has its own expected-failures file, and we always want to know that it is correct, + if (ctx.build.event != "tag"): + pipelines.append(uiTestPipeline(ctx, filterTags, earlyFail)) + + return pipelines def uiTestPipeline(ctx, filterTags, earlyFail, runPart = 1, numberOfParts = 1, storage = "ocis", accounts_hash_difficulty = 4): standardFilterTags = "not @skipOnOCIS and not @skip and not @notToImplementOnOCIS and not @federated-server-needed" @@ -543,10 +547,15 @@ def uiTestPipeline(ctx, filterTags, earlyFail, runPart = 1, numberOfParts = 1, s finalFilterTags = filterTags + " and " + standardFilterTags expectedFailuresFileFilterTags = "-" + filterTags.lstrip("@") + if numberOfParts == 1: + pipelineName = "Web-Tests-ocis-%s-storage" % storage + else: + pipelineName = "Web-Tests-ocis-%s-storage-%s" % (storage, runPart) + return { "kind": "pipeline", "type": "docker", - "name": "Web-Tests-ocis-%s-storage-%s" % (storage, runPart), + "name": pipelineName, "platform": { "os": "linux", "arch": "amd64",