Skip to content

Commit

Permalink
[build.webkit.org] Report DNS name, not HOSTNAME to results.webkit.org
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=269990
rdar://123508951

Reviewed by Aakash Jain.

* Tools/CISupport/build-webkit-org/steps.py:
(RunJavaScriptCoreTests): Use DNS_NAME instead of CURRENT_HOSTNAME.
(RunWebKitTests): Ditto.
(RunAPITests): Ditto.
(RunWebKitPyTests): Ditto.
(RunLLINTCLoopTests): Ditto.
(Run32bitJSCTests): Ditto.

Canonical link: https://commits.webkit.org/275238@main
  • Loading branch information
JonWBedard committed Feb 23, 2024
1 parent 33172df commit 53197ed
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions Tools/CISupport/build-webkit-org/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
THRESHOLD_FOR_EXCESSIVE_LOGS = 1000000
MSG_FOR_EXCESSIVE_LOGS = f'Stopped due to excessive logging, limit: {THRESHOLD_FOR_EXCESSIVE_LOGS}'

DNS_NAME = CURRENT_HOSTNAME
if DNS_NAME in BUILD_WEBKIT_HOSTNAMES:
DNS_NAME = 'build.webkit.org'


class CustomFlagsMixin(object):

Expand Down Expand Up @@ -628,7 +632,7 @@ class RunJavaScriptCoreTests(TestWithFailureCount, CustomFlagsMixin):
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--buildbot-worker", WithProperties("%(workername)s"),
"--buildbot-master", CURRENT_HOSTNAME,
"--buildbot-master", DNS_NAME,
"--report", RESULTS_WEBKIT_URL,
]
commandExtra = ['--treat-failing-as-flaky=0.7,10,20']
Expand Down Expand Up @@ -723,7 +727,7 @@ class RunWebKitTests(shell.TestNewStyle, CustomFlagsMixin):
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--buildbot-worker", WithProperties("%(workername)s"),
"--buildbot-master", CURRENT_HOSTNAME,
"--buildbot-master", DNS_NAME,
"--report", RESULTS_WEBKIT_URL,
"--exit-after-n-crashes-or-timeouts", "50",
"--exit-after-n-failures", "500",
Expand Down Expand Up @@ -859,7 +863,7 @@ class RunAPITests(TestWithFailureCount, CustomFlagsMixin):
f"--json-output={jsonFileName}",
WithProperties("--%(configuration)s"),
"--verbose",
"--buildbot-master", CURRENT_HOSTNAME,
"--buildbot-master", DNS_NAME,
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--buildbot-worker", WithProperties("%(workername)s"),
Expand Down Expand Up @@ -947,7 +951,7 @@ class RunWebKitPyTests(RunPythonTests):
"python3",
"Tools/Scripts/test-webkitpy",
"--verbose",
"--buildbot-master", CURRENT_HOSTNAME,
"--buildbot-master", DNS_NAME,
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--buildbot-worker", WithProperties("%(workername)s"),
Expand Down Expand Up @@ -1015,7 +1019,7 @@ class RunLLINTCLoopTests(TestWithFailureCount):
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--buildbot-worker", WithProperties("%(workername)s"),
"--buildbot-master", CURRENT_HOSTNAME,
"--buildbot-master", DNS_NAME,
"--report", RESULTS_WEBKIT_URL,
]
failedTestsFormatString = "%d regression%s found."
Expand Down Expand Up @@ -1056,7 +1060,7 @@ class Run32bitJSCTests(TestWithFailureCount):
"--builder-name", WithProperties("%(buildername)s"),
"--build-number", WithProperties("%(buildnumber)s"),
"--buildbot-worker", WithProperties("%(workername)s"),
"--buildbot-master", CURRENT_HOSTNAME,
"--buildbot-master", DNS_NAME,
"--report", RESULTS_WEBKIT_URL,
]
failedTestsFormatString = "%d regression%s found."
Expand Down

0 comments on commit 53197ed

Please sign in to comment.