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: ''