1 |
commit: 49658ae9a6842348fbad6d0674a7a7daf7aa0a37 |
2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 24 00:38:42 2022 +0000 |
4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 24 00:38:42 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=49658ae9 |
7 |
|
8 |
add url for logs downloads |
9 |
|
10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
11 |
|
12 |
buildbot_gentoo_ci/steps/builders.py | 69 ++++++++++++++++++++++++------------ |
13 |
1 file changed, 46 insertions(+), 23 deletions(-) |
14 |
|
15 |
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py |
16 |
index 527c2b3..4ade33d 100644 |
17 |
--- a/buildbot_gentoo_ci/steps/builders.py |
18 |
+++ b/buildbot_gentoo_ci/steps/builders.py |
19 |
@@ -17,6 +17,9 @@ from buildbot.process.results import FAILURE |
20 |
from buildbot.process.results import SKIPPED |
21 |
from buildbot.plugins import steps |
22 |
|
23 |
+#FIXME: should be set in config |
24 |
+hosturl = 'http://77.110.8.67:8000' |
25 |
+ |
26 |
def PersOutputOfEmerge(rc, stdout, stderr): |
27 |
emerge_output = {} |
28 |
emerge_output['rc'] = rc |
29 |
@@ -603,12 +606,14 @@ class CheckElogLogs(BuildStep): |
30 |
super().__init__(**kwargs) |
31 |
self.aftersteps_list = [] |
32 |
|
33 |
- def addFileUploade(self, sourcefile, destfile, name): |
34 |
+ def addFileUploade(self, sourcefile, destfile, name, url, urlText): |
35 |
self.aftersteps_list.append(steps.FileUpload( |
36 |
name = name, |
37 |
mode = 0o644, |
38 |
- workersrc=sourcefile, |
39 |
- masterdest=destfile |
40 |
+ workersrc = sourcefile, |
41 |
+ masterdest = destfile, |
42 |
+ url = url, |
43 |
+ urlText = urlText |
44 |
)) |
45 |
|
46 |
@defer.inlineCallbacks |
47 |
@@ -625,7 +630,9 @@ class CheckElogLogs(BuildStep): |
48 |
destfile = yield os.path.join(self.getProperty('masterdest'), elogfile.replace('.log', '.elog')) |
49 |
sourcefile = yield os.path.join(workdir, elogfile) |
50 |
name = 'Upload Elogs' |
51 |
- self.addFileUploade(sourcefile, destfile, name) |
52 |
+ url = '/'.join([hosturl, self.getProperty('workername'), str(self.getProperty("buildnumber")), elogfile.replace('.log', '.elog')]) |
53 |
+ urlText = elogfile |
54 |
+ self.addFileUploade(sourcefile, destfile, name, url, urlText) |
55 |
if self.aftersteps_list != []: |
56 |
yield self.build.addStepsAfterCurrentStep(self.aftersteps_list) |
57 |
return SUCCESS |
58 |
@@ -669,7 +676,9 @@ class CheckBuildWorkDirs(BuildStep): |
59 |
mode = 0o644, |
60 |
workersrc = compressed_log_file, |
61 |
masterdest = masterdest_file, |
62 |
- workdir = cpv_build_dir |
63 |
+ workdir = cpv_build_dir, |
64 |
+ url = '/'.join([hosturl, self.getProperty('workername'), str(self.getProperty("buildnumber")), compressed_log_file]), |
65 |
+ urlText = 'Compresed file for all finds' |
66 |
)) |
67 |
if self.aftersteps_list != []: |
68 |
yield self.build.addStepsAfterCurrentStep(self.aftersteps_list) |
69 |
@@ -710,24 +719,29 @@ class CheckEmergeLogs(BuildStep): |
70 |
workdir = yield os.path.join(self.master.basedir, 'workers', self.getProperty('workername')) |
71 |
self.aftersteps_list.append(steps.MasterShellCommand( |
72 |
name = 'Make directory for Uploaded files', |
73 |
- command=['mkdir', str(self.getProperty("buildnumber"))], |
74 |
- workdir=workdir |
75 |
+ command = ['mkdir', str(self.getProperty("buildnumber"))], |
76 |
+ workdir = workdir |
77 |
)) |
78 |
|
79 |
- def addFileUploade(self, sourcefile, destfile, name): |
80 |
+ def addFileUploade(self, sourcefile, destfile, name, url, urlText): |
81 |
self.aftersteps_list.append(steps.FileUpload( |
82 |
name = name, |
83 |
mode = 0o644, |
84 |
- workersrc=sourcefile, |
85 |
- masterdest=destfile |
86 |
+ workersrc = sourcefile, |
87 |
+ masterdest = destfile, |
88 |
+ url=url, |
89 |
+ urlText=urlText |
90 |
)) |
91 |
|
92 |
@defer.inlineCallbacks |
93 |
def getLogFile(self, cpv, log_dict): |
94 |
- destfile = yield os.path.join(self.getProperty('masterdest'), log_dict[cpv]['full_logname']) |
95 |
+ file = log_dict[cpv]['full_logname'] |
96 |
+ destfile = yield os.path.join(self.getProperty('masterdest'), file) |
97 |
sourcefile = log_dict[cpv]['log_path'] |
98 |
name = 'Upload build log' |
99 |
- self.addFileUploade(sourcefile, destfile, name) |
100 |
+ url = '/'.join([hosturl, self.getProperty('workername'), str(self.getProperty("buildnumber")), file]) |
101 |
+ urlText = file |
102 |
+ self.addFileUploade(sourcefile, destfile, name, url, urlText) |
103 |
|
104 |
@defer.inlineCallbacks |
105 |
def getElogFiles(self, cpv): |
106 |
@@ -750,20 +764,29 @@ class CheckEmergeLogs(BuildStep): |
107 |
@defer.inlineCallbacks |
108 |
def getEmergeFiles(self, cpv): |
109 |
# get emerge info |
110 |
- destfile = yield os.path.join(self.getProperty('masterdest'), 'emerge_info.txt') |
111 |
- sourcefile = yield os.path.join('/', 'tmp', 'emerge_info.txt') |
112 |
+ file = 'emerge_info.txt' |
113 |
+ destfile = yield os.path.join(self.getProperty('masterdest'), file) |
114 |
+ sourcefile = yield os.path.join('/', 'tmp', file) |
115 |
name = 'Upload emerge info' |
116 |
- self.addFileUploade(sourcefile, destfile, name) |
117 |
+ url = '/'.join([hosturl, self.getProperty('workername'), str(self.getProperty("buildnumber")), file]) |
118 |
+ urlText = 'emerge --info and package info' |
119 |
+ self.addFileUploade(sourcefile, destfile, name, url, urlText) |
120 |
# get emerge.log |
121 |
- destfile2 = yield os.path.join(self.getProperty('masterdest'), 'emerge.log') |
122 |
- sourcefile2 = yield os.path.join('/', 'var', 'log', 'emerge.log') |
123 |
- name2 = 'Upload emerge log' |
124 |
- self.addFileUploade(sourcefile2, destfile2, name2) |
125 |
+ file = 'emerge.log' |
126 |
+ destfile = yield os.path.join(self.getProperty('masterdest'), file) |
127 |
+ sourcefile = yield os.path.join('/', 'var', 'log', file) |
128 |
+ name = 'Upload emerge log' |
129 |
+ url = '/'.join([hosturl, self.getProperty('workername'), str(self.getProperty("buildnumber")), file]) |
130 |
+ urlText = 'emerge.log' |
131 |
+ self.addFileUploade(sourcefile, destfile, name, url, urlText) |
132 |
# world file |
133 |
- destfile3 = yield os.path.join(self.getProperty('masterdest'), 'world') |
134 |
- sourcefile3 = yield os.path.join('/', 'var', 'lib', 'portage', 'world') |
135 |
- name3 = 'Upload world file' |
136 |
- self.addFileUploade(sourcefile3, destfile3, name3) |
137 |
+ file = 'world' |
138 |
+ destfile = yield os.path.join(self.getProperty('masterdest'), file) |
139 |
+ sourcefile = yield os.path.join('/', 'var', 'lib', 'portage', file) |
140 |
+ name = 'Upload world file' |
141 |
+ url = '/'.join([hosturl, self.getProperty('workername'), str(self.getProperty("buildnumber")), file]) |
142 |
+ urlText = 'world file' |
143 |
+ self.addFileUploade(sourcefile, destfile, name, url, urlText) |
144 |
# get elogs |
145 |
self.getElogFiles(cpv) |