Skip to content

Commit 4f9a112

Browse files
author
buildbot
committed
Added a buildbot master config file for buildbot 2.7, and a passwords template.
- Legacy-Id: 17658
1 parent cdaa2bc commit 4f9a112

3 files changed

Lines changed: 455 additions & 6 deletions

File tree

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright The IETF Trust 2015-2020, All Rights Reserved
2+
# -*- coding: utf-8 -*-
3+
4+
# Uncomment and set passwords below to match those set for the workers, then
5+
# save as "buildbot_passwords.py"
6+
7+
# datatracker_lin_py27_1_pw = "<password>"
8+
# datatracker_lin_py27_2_pw = "<password>"
9+
# datatracker_lin_py27_3_pw = "<password>"
10+
# datatracker_osx_py27_4_pw = "<password>"
11+
# datatracker_lin_py27_5_pw = "<password>"
12+
# datatracker_lin_py27_6_pw = "<password>"
13+
# ietfdb_svn_hook_pw = "<password>"
14+
#
15+
# datatracker_lin_py36_1_pw = "<password>"
16+
# datatracker_lin_py36_2_pw = "<password>"
17+
# datatracker_lin_py36_3_pw = "<password>"
18+
# datatracker_lin_py36_4_pw = "<password>"
19+
# datatracker_lin_py36_5_pw = "<password>"
20+
# datatracker_lin_py36_6_pw = "<password>"
21+

buildbot/masters/datatracker/custom_steps.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ def createSummary(self, log):
6666
wregex[key] = pattern
6767

6868
# Count matches to the various warning patterns
69+
last_line = None
6970
for line in log.getText().split("\n"):
7071
for key in wregex:
7172
match = re.search(wregex[key], line)
@@ -83,11 +84,12 @@ def createSummary(self, log):
8384
self.step_status.setStatistic(key, len(warnings[key]))
8485
self.setProperty(key, len(warnings[key]), "TestCrawlerShellCommand")
8586

86-
match = re.search(self.logline, last_line)
87-
for key in ['elapsed', 'pages']:
88-
info = match.group(key)
89-
self.step_status.setStatistic(key, info)
90-
self.setProperty(key, info, "TestCrawlerShellCommand")
87+
if last_line:
88+
match = re.search(self.logline, last_line)
89+
for key in ['elapsed', 'pages']:
90+
info = match.group(key)
91+
self.step_status.setStatistic(key, info)
92+
self.setProperty(key, info, "TestCrawlerShellCommand")
9193

9294
def describe(self, done=False):
9395
description = steps.WarningCountingShellCommand.describe(self, done)
@@ -113,7 +115,7 @@ class DjangoTest(steps.WarningCountingShellCommand):
113115
warnOnFailure = 1
114116
description = ["testing"]
115117
descriptionDone = ["test"]
116-
command = ["python", "-m", "unittest", "discover"]
118+
command = ["manage.py", "test", ]
117119

118120
regexPatterns = {
119121
"tests": "Ran (\d+) tests in [0-9.]+s",

0 commit comments

Comments
 (0)