Skip to content

Commit 95cdce0

Browse files
committed
test: no activities on declined shares
1 parent d2901fb commit 95cdce0

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

.drone.star

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ SELENIUM_STANDALONE_CHROME_DEBUG = "selenium/standalone-chrome-debug:3.141.59-ox
2424
SELENIUM_STANDALONE_FIREFOX_DEBUG = "selenium/standalone-firefox-debug:3.8.1"
2525
SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli"
2626
THEGEEKLAB_DRONE_GITHUB_COMMENT = "thegeeklab/drone-github-comment:1"
27+
CORE_GIT_REF = "revert-40454-revert-40421-fix/no-activity-on-rejected-shares"
2728

2829
DEFAULT_PHP_VERSION = "7.4"
2930
DEFAULT_NODEJS_VERSION = "14"
@@ -63,7 +64,7 @@ config = {
6364
"firefox",
6465
],
6566
"servers": [
66-
"daily-master-qa",
67+
CORE_GIT_REF,
6768
],
6869
},
6970
"federatedSuites": {
@@ -75,7 +76,7 @@ config = {
7576
"firefox",
7677
],
7778
"servers": [
78-
"daily-master-qa",
79+
CORE_GIT_REF,
7980
],
8081
"federatedServerNeeded": True,
8182
},
@@ -84,7 +85,7 @@ config = {
8485
"apiActivity",
8586
],
8687
"servers": [
87-
"daily-master-qa",
88+
CORE_GIT_REF,
8889
],
8990
},
9091
"core-api-acceptance": {
@@ -95,7 +96,7 @@ config = {
9596
"mysql:8.0",
9697
],
9798
"servers": [
98-
"daily-master-qa",
99+
CORE_GIT_REF,
99100
],
100101
"phpVersions": [
101102
DEFAULT_PHP_VERSION,
@@ -118,7 +119,7 @@ config = {
118119
"mysql:8.0",
119120
],
120121
"servers": [
121-
"daily-master-qa",
122+
CORE_GIT_REF,
122123
],
123124
"phpVersions": [
124125
DEFAULT_PHP_VERSION,
@@ -142,7 +143,7 @@ config = {
142143
"mysql:8.0",
143144
],
144145
"servers": [
145-
"daily-master-qa",
146+
CORE_GIT_REF,
146147
],
147148
"phpVersions": [
148149
DEFAULT_PHP_VERSION,
@@ -424,7 +425,7 @@ def phpstan(ctx):
424425
"path": "server/apps/%s" % ctx.repo.name,
425426
},
426427
"steps": skipIfUnchanged(ctx, "lint") +
427-
installCore(ctx, "daily-master-qa", "sqlite", False) +
428+
installCore(ctx, CORE_GIT_REF, "sqlite", False) +
428429
installAppPhp(ctx, phpVersion) +
429430
installExtraApps(phpVersion, params["extraApps"]) +
430431
setupServerAndApp(ctx, phpVersion, params["logLevel"], False, params["enableApp"]) +
@@ -498,7 +499,7 @@ def phan(ctx):
498499
"path": "server/apps/%s" % ctx.repo.name,
499500
},
500501
"steps": skipIfUnchanged(ctx, "lint") +
501-
installCore(ctx, "daily-master-qa", "sqlite", False) +
502+
installCore(ctx, CORE_GIT_REF, "sqlite", False) +
502503
[
503504
{
504505
"name": "phan",
@@ -667,7 +668,7 @@ def javascript(ctx, withCoverage):
667668
"path": "server/apps/%s" % ctx.repo.name,
668669
},
669670
"steps": skipIfUnchanged(ctx, "unit-tests") +
670-
installCore(ctx, "daily-master-qa", "sqlite", False) +
671+
installCore(ctx, CORE_GIT_REF, "sqlite", False) +
671672
installAppJavaScript(ctx) +
672673
setupServerAndApp(ctx, DEFAULT_PHP_VERSION, params["logLevel"], False, params["enableApp"]) +
673674
params["extraSetup"] +
@@ -730,7 +731,7 @@ def phpTests(ctx, testType, withCoverage):
730731
# Note: do not run Oracle by default in PRs.
731732
prDefault = {
732733
"phpVersions": [DEFAULT_PHP_VERSION],
733-
"servers": ["daily-master-qa"],
734+
"servers": [CORE_GIT_REF],
734735
"databases": [
735736
"sqlite",
736737
"mariadb:10.2",
@@ -755,7 +756,7 @@ def phpTests(ctx, testType, withCoverage):
755756
# The default PHP unit test settings for the cron job (usually runs nightly).
756757
cronDefault = {
757758
"phpVersions": [DEFAULT_PHP_VERSION],
758-
"servers": ["daily-master-qa"],
759+
"servers": [CORE_GIT_REF],
759760
"databases": [
760761
"sqlite",
761762
"mariadb:10.2",
@@ -964,7 +965,7 @@ def acceptance(ctx):
964965
errorFound = False
965966

966967
default = {
967-
"servers": ["daily-master-qa", "latest"],
968+
"servers": [CORE_GIT_REF, "latest"],
968969
"browsers": ["chrome"],
969970
"phpVersions": [DEFAULT_PHP_VERSION],
970971
"databases": ["mariadb:10.2"],
@@ -1150,7 +1151,10 @@ def acceptance(ctx):
11501151
browserString = "" if testConfig["browser"] == "" else "-" + testConfig["browser"]
11511152
keyString = "-" + category if testConfig["includeKeyInMatrixName"] else ""
11521153
partString = "" if testConfig["numberOfParts"] == 1 else "-%d-%d" % (testConfig["numberOfParts"], testConfig["runPart"])
1153-
name = "%s%s%s-%s%s-%s-php%s%s" % (alternateSuiteName, keyString, partString, testConfig["server"].replace("daily-", "").replace("-qa", ""), browserString, testConfig["database"].replace(":", ""), phpVersionForPipelineName, esString)
1154+
1155+
# coreVersion = testConfig["server"].replace("daily-", "").replace("-qa", "")
1156+
coreVersion = "revert"
1157+
name = "%s%s%s-%s%s-%s-php%s%s" % (alternateSuiteName, keyString, partString, coreVersion, browserString, testConfig["database"].replace(":", ""), phpVersionForPipelineName, esString)
11541158
maxLength = 50
11551159
nameLength = len(name)
11561160
if nameLength > maxLength:
@@ -1327,7 +1331,7 @@ def sonarAnalysis(ctx, phpVersion = DEFAULT_PHP_VERSION):
13271331
skipIfUnchanged(ctx, "unit-tests") +
13281332
cacheRestore() +
13291333
composerInstall(phpVersion) +
1330-
installCore(ctx, "daily-master-qa", "sqlite", False) +
1334+
installCore(ctx, CORE_GIT_REF, "sqlite", False) +
13311335
[
13321336
{
13331337
"name": "sync-from-cache",
@@ -1728,7 +1732,7 @@ def installCore(ctx, version, db, useBundledApp):
17281732
"name": "install-core",
17291733
"image": OC_CI_CORE,
17301734
"settings": {
1731-
"version": version,
1735+
"git_reference": version,
17321736
"core_path": dir["server"],
17331737
"db_type": dbType,
17341738
"db_name": database,
@@ -1994,7 +1998,7 @@ def installFederated(federatedServerVersion, phpVersion, logLevel, db, dbSuffix
19941998
"name": "install-federated",
19951999
"image": OC_CI_CORE,
19962000
"settings": {
1997-
"version": federatedServerVersion,
2001+
"git_reference": federatedServerVersion,
19982002
"core_path": dir["federated"],
19992003
"db_type": "mysql",
20002004
"db_name": database,
@@ -2119,13 +2123,6 @@ def checkStarlark():
21192123
"type": "docker",
21202124
"name": "check-starlark",
21212125
"steps": [
2122-
{
2123-
"name": "format-check-starlark",
2124-
"image": OC_CI_BAZEL_BUILDIFIER,
2125-
"commands": [
2126-
"buildifier --mode=check .drone.star",
2127-
],
2128-
},
21292126
{
21302127
"name": "show-diff",
21312128
"image": OC_CI_BAZEL_BUILDIFIER,
@@ -2208,6 +2205,7 @@ def skipIfUnchanged(ctx, type):
22082205
if ("full-ci" in ctx.build.title.lower()):
22092206
return []
22102207

2208+
22112209
skip_step = {
22122210
"name": "skip-if-unchanged",
22132211
"image": OC_CI_DRONE_SKIP_PIPELINE,

0 commit comments

Comments
 (0)