[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: openwrt: unbuffered python output

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
e2630fb7 by Paul Spooren at 2019-10-08T22:54:26Z
openwrt: unbuffered python output

this should allow to read log messages in the jenkins output on the fly

Signed-off-by: Paul Spooren <mail at aparcar.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
0443a133 by Paul Spooren at 2019-10-08T22:55:20Z
openwrt: fixup newlines

Initially I missunderstood the email format, now this should do the
trick by keeping newlines in the split array.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- bin/reproducible_openwrt_package_parser.py
- bin/reproducible_openwrt_rebuild.py
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_openwrt_package_parser.py
=====================================
@@ -21,7 +21,7 @@ def parse_packages(package_list_fp):
     packages = []
 
     for line in package_list_fp:
-        if line == '\n' or line == '':
+        if line == '\n':
             parser = email.parser.Parser()
             package = parser.parsestr(linebuffer)
             packages.append(package)


=====================================
bin/reproducible_openwrt_rebuild.py
=====================================
@@ -451,9 +451,9 @@ def diffoscope_multithread():
 
 def store_results():
     with open(target_dir + "/packages/Packages.manifest") as rebuild_manifest:
-        origin_manifest = get_file(download_url + "/packages/Packages.manifest")
         result = show_list_difference(
-            origin_manifest, rebuild_manifest.read().splitlines()
+            urlopen(download_url + "/packages/Packages.manifest").readlines(),
+            rebuild_manifest.readlines(),
         )
         insert_into_db(result, "{}-rebuild".format(version))
 


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -651,12 +651,12 @@
                     my_description: 'Rebuild an OpenWrt snapshot or a release today.'
                     my_hname: 'osuosl171'
                     my_timed: '0 0 * * H/3'
-                    my_shell: "/srv/jenkins/bin/reproducible_openwrt_rebuild.py"
+                    my_shell: "python3 -u /srv/jenkins/bin/reproducible_openwrt_rebuild.py"
                 - 'openwrt_rebuilder_future':
                     my_description: 'Rebuild an OpenWrt snapshot or a release in the future.'
                     my_hname: 'osuosl172'
                     my_timed: '0 2 * * H/3'
-                    my_shell: "/srv/jenkins/bin/reproducible_openwrt_rebuild.py"
+                    my_shell: "python3 -u /srv/jenkins/bin/reproducible_openwrt_rebuild.py"
             my_shellext: ".sh"
             my_shell: '/srv/jenkins/bin/reproducible_{my_task}{my_shellext}'
             my_hname: ''



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/23b922216740da45865e5e4901b4297ce54091ff...0443a133987b1c5129c7f1301839543d5f26ec8d

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/23b922216740da45865e5e4901b4297ce54091ff...0443a133987b1c5129c7f1301839543d5f26ec8d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20191008/879cd0f7/attachment-0001.html>