[Qa-jenkins-scm] [jenkins.debian.net] 04/06: get rid of some duplication (shame about the need for my_shellext)

Holger Levsen holger at moszumanska.debian.org
Sun Dec 13 23:38:16 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit c92a78c2ee5bfa44d29583ab81308773952a1947
Author: Philip Hands <phil at hands.com>
Date:   Sun Dec 13 22:01:04 2015 +0100

    get rid of some duplication (shame about the need for my_shellext)
---
 job-cfg/reproducible.yaml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 4b05788..401c739 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -375,64 +375,59 @@
                 - 'scheduler':
                     my_description: 'Schedule packages to be tested for reproducibility.'
                     my_timed: '10 * * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_scheduler.py'
+                    my_shellext: ".py"
                 - 'html_dashboard':
                     my_description: 'Generate HTML dashboard with graphs for reproducible builds.'
                     my_timed: '*/5 * * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_dashboard.sh'
                 - 'html_pkg_sets':
                     my_description: 'Generate HTML results (package sets with graphs) for reproducible builds.'
                     my_timed: '0 * * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_pkg_sets.sh'
                 - 'html_indexes':
                     my_description: 'Generate HTML results (indexes) for reproducible builds.'
                     my_timed: '*/15 * * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_indexes.py'
+                    my_shellext: ".py"
                 - 'html_dd_list':
                     my_description: 'Generate HTML results (dd-list) for reproducible builds.'
                     my_timed: '55 */2 * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_dd_list.py'
+                    my_shellext: ".py"
                 - 'html_all_packages':
                     my_description: 'Generate HTML results (for all packages) for reproducible builds. This job is rather redudant and just run to give a fuzzy warm feeling all pages are good.'
                     my_timed: '37 13 * * 1'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_all_packages.py'
+                    my_shellext: ".py"
                 - 'html_repository_comparison':
                     my_description: 'Generate HTML results (repository_comparison) for reproducible builds.'
                     my_timed: '0 1 * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_repository_comparison.sh'
                 - 'html_breakages':
                     my_description: 'Generate an HTML page with CI issues (packages with incoherent status or files that should or should not be there).'
                     my_timed: '30 0,12 * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_breakages.py'
+                    my_shellext: ".py"
                 - 'html_rsync_remote_results':
                     my_description: 'rsync the results from some remote jobs to the main node.'
                     my_timed: ''
-                    my_shell: '/srv/jenkins/bin/reproducible_html_rsync_remote_results.sh'
                 - 'html_live_status':
                     my_description: 'Generate an HTML page showing the live status of all builds happening or scheduled by humans.'
                     my_timed: 'H/2 * * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_html_live_status.py'
+                    my_shellext: ".py"
                 - 'create_meta_pkg_sets':
                     my_description: 'Create meta package sets for later consumption when generating HTML stats.'
                     my_timed: '0 6 * * H/3'
-                    my_shell: '/srv/jenkins/bin/reproducible_create_meta_pkg_sets.sh'
                 - 'nodes_info':
                     my_description: 'Collect various information from build nodes used for reproducible builds.'
                     my_timed: '0 0 * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_nodes_info.sh'
                 - 'json':
                     my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json for consumption by tracker.debian.org.'
                     my_timed: '1 * * * *'
-                    my_shell: '/srv/jenkins/bin/reproducible_json.py'
+                    my_shellext: ".py"
                 - 'html_archlinux':
                     my_description: 'Build a simple webpage for Arch Linux reproducibility tests'
                     my_timed: ''
-                    my_shell: '/srv/jenkins/bin/reproducible_html_archlinux.sh'
                 - 'html_fedora-23_x86_64':
                     my_description: 'Build a simple webpage for Fedora 23 reproducibility tests'
                     my_timed: ''
                     my_shell: '/srv/jenkins/bin/reproducible_html_rpms.sh fedora-23 x86_64'
 
+            my_shellext: ".sh"
+            my_shell: '/srv/jenkins/bin/reproducible_{my_task}{my_shellext}'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: '{my_hname}'
             my_hname: ''

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list