|
1 | 1 | BANST_AWS_CLI = "banst/awscli" |
2 | | -DRONE_CLI = "drone/cli:alpine" |
3 | 2 | INBUCKET_INBUCKET = "inbucket/inbucket" |
4 | 3 | MINIO_MC = "minio/mc:RELEASE.2020-12-18T10-53-53Z" |
5 | 4 | OC_CI_ALPINE = "owncloudci/alpine:latest" |
6 | 5 | OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier" |
7 | 6 | OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04" |
8 | 7 | OC_CI_CORE = "owncloudci/core" |
9 | | -OC_CI_DRONE_CANCEL_PREVIOUS_BUILDS = "owncloudci/drone-cancel-previous-builds" |
10 | 8 | OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline" |
11 | 9 | OC_CI_NODEJS = "owncloudci/nodejs:%s" |
12 | 10 | OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest" |
@@ -207,7 +205,7 @@ def main(ctx): |
207 | 205 | return before + coverageTests + afterCoverageTests + nonCoverageTests + stages + after |
208 | 206 |
|
209 | 207 | def beforePipelines(ctx): |
210 | | - return validateDailyTarballBuild() + codestyle(ctx) + jscodestyle(ctx) + cancelPreviousBuilds() + phpstan(ctx) + phan(ctx) + phplint(ctx) + checkStarlark() |
| 208 | + return validateDailyTarballBuild() + codestyle(ctx) + jscodestyle(ctx) + phpstan(ctx) + phan(ctx) + phplint(ctx) + checkStarlark() |
211 | 209 |
|
212 | 210 | def coveragePipelines(ctx): |
213 | 211 | # All unit test pipelines that have coverage or other test analysis reported |
@@ -361,31 +359,6 @@ def jscodestyle(ctx): |
361 | 359 |
|
362 | 360 | return pipelines |
363 | 361 |
|
364 | | -def cancelPreviousBuilds(): |
365 | | - return [{ |
366 | | - "kind": "pipeline", |
367 | | - "type": "docker", |
368 | | - "name": "cancel-previous-builds", |
369 | | - "clone": { |
370 | | - "disable": True, |
371 | | - }, |
372 | | - "steps": [{ |
373 | | - "name": "cancel-previous-builds", |
374 | | - "image": OC_CI_DRONE_CANCEL_PREVIOUS_BUILDS, |
375 | | - "settings": { |
376 | | - "DRONE_TOKEN": { |
377 | | - "from_secret": "drone_token", |
378 | | - }, |
379 | | - }, |
380 | | - }], |
381 | | - "depends_on": [], |
382 | | - "trigger": { |
383 | | - "ref": [ |
384 | | - "refs/pull/**", |
385 | | - ], |
386 | | - }, |
387 | | - }] |
388 | | - |
389 | 362 | def phpstan(ctx): |
390 | 363 | pipelines = [] |
391 | 364 |
|
@@ -1265,7 +1238,7 @@ def acceptance(ctx): |
1265 | 1238 | "path": "%s/downloads" % dir["server"], |
1266 | 1239 | }], |
1267 | 1240 | }), |
1268 | | - ] + testConfig["extraTeardown"] + githubComment(params["earlyFail"]) + stopBuild(ctx, params["earlyFail"]), |
| 1241 | + ] + testConfig["extraTeardown"] + githubComment(params["earlyFail"]), |
1269 | 1242 | "services": databaseService(testConfig["database"]) + |
1270 | 1243 | browserService(testConfig["browser"]) + |
1271 | 1244 | emailService(testConfig["emailNeeded"]) + |
@@ -2098,33 +2071,6 @@ def buildTestConfig(params): |
2098 | 2071 | configs.append(config) |
2099 | 2072 | return configs |
2100 | 2073 |
|
2101 | | -def stopBuild(ctx, earlyFail): |
2102 | | - if (earlyFail): |
2103 | | - return [{ |
2104 | | - "name": "stop-build", |
2105 | | - "image": DRONE_CLI, |
2106 | | - "environment": { |
2107 | | - "DRONE_SERVER": "https://drone.owncloud.com", |
2108 | | - "DRONE_TOKEN": { |
2109 | | - "from_secret": "drone_token", |
2110 | | - }, |
2111 | | - }, |
2112 | | - "commands": [ |
2113 | | - "drone build stop owncloud/%s ${DRONE_BUILD_NUMBER}" % ctx.repo.name, |
2114 | | - ], |
2115 | | - "when": { |
2116 | | - "status": [ |
2117 | | - "failure", |
2118 | | - ], |
2119 | | - "event": [ |
2120 | | - "pull_request", |
2121 | | - ], |
2122 | | - }, |
2123 | | - }] |
2124 | | - |
2125 | | - else: |
2126 | | - return [] |
2127 | | - |
2128 | 2074 | def githubComment(earlyFail): |
2129 | 2075 | if (earlyFail): |
2130 | 2076 | return [{ |
|
0 commit comments