From 4d0315d978619ac761a3f9f1ae6d157ffff5a010 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 7 May 2016 13:20:01 +0200 Subject: s#http://anonscm.debian.org/cgit#https://anonscm.debian.org/git#g --- CONTRIBUTING | 2 +- README | 2 +- bin/reproducible_common.py | 4 ++-- bin/reproducible_common.sh | 6 +++--- bin/reproducible_html_breakages.py | 2 +- bin/reproducible_html_repository_comparison.sh | 8 ++++---- debian/control | 2 +- job-cfg/chroot-installation.yaml.py | 2 +- job-cfg/d-i-overview.yaml | 2 +- job-cfg/d-i.yaml.py | 2 +- job-cfg/debsums-tests.yaml | 2 +- job-cfg/dpkg.yaml | 2 +- job-cfg/edu-packages.yaml | 2 +- job-cfg/g-i-installation.yaml | 2 +- job-cfg/haskell-package-plan.yaml | 2 +- job-cfg/lintian-tests.yaml | 2 +- job-cfg/live.yaml | 2 +- job-cfg/lvc.yaml | 2 +- job-cfg/piuparts.yaml | 2 +- job-cfg/rebootstrap.yaml.py | 2 +- job-cfg/reproducible.yaml | 2 +- job-cfg/schroot.yaml | 2 +- job-cfg/self.yaml | 2 +- job-cfg/torbrowser-launcher.yaml | 6 +++--- job-cfg/udd.yaml | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index d3e183ea..ddd27e9b 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -6,7 +6,7 @@ The BTS will ensure the developers' mailing list debian-qa@lists.debian.org is notified. -The code is available in the link:http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/[jenkins.debian.net.git repository]. +The code is available in the link:https://anonscm.debian.org/git/qa/jenkins.debian.net.git/tree/[jenkins.debian.net.git repository]. Patches can be submitted as requests to pull from a publicly-visible git repository (this is the prefered way) communicated via IRC or mail, diff --git a/README b/README index 38bfc9a1..8e2a652c 100644 --- a/README +++ b/README @@ -236,7 +236,7 @@ See link:https://jenkins.debian.net/userContent/thanks.html[THANKS]. == License * everything except features and bin/libvirt_cucumber_tests: -** GPLv2, see link:http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/LICENSE[LICENSE]. +** GPLv2, see link:https://anonscm.debian.org/git/qa/jenkins.debian.net.git/LICENSE[LICENSE]. * features and bin/libvirt_cucumber_tests: ** GPLv3+ diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 4e115f49..e40ea276 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -145,7 +145,7 @@ else: JOB_NAME = os.path.basename(JOB_URL[:-1]) JOB_FOOTER = 'This page was built by the jenkins job ' JOB_FOOTER += JOB_NAME+' which is configured via this ' - JOB_FOOTER += 'git repo.' + JOB_FOOTER += 'git repo.' html_footer = Template("""

@@ -157,7 +157,7 @@ html_footer = Template("""
Last update: $date. Copyright 2014-2016 Holger Levsen and many others. - The code of jenkins.debian.net.git is mostly + The code of jenkins.debian.net.git is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library. diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 84e2fc84..eb5fe913 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -322,7 +322,7 @@ write_page_intro() { write_page "

Please note that this set up is as new as December 12th, so quite some things are still lacking, eg. https://github.com/kholia/ReproducibleBuilds is not followed at all yet and there are no variations introduced for the 2nd build. Also only a subset of all source packages is currently being tested. OTOH this setup is mature enough that it requires very few trivial changes to build all 17080 source packages in $PROJECTNAME, if it were sensible. Which it isn't right now, but should be soon.

" fi if [ "$1" != "Arch Linux" ] && [ "$1" != "fedora-23" ] ; then - write_page "

There is a weekly run jenkins job to test the $BRANCH branch of $PROJECTNAME.git. The jenkins job is running reproducible_$PROJECTNAME.sh$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join #debian-reproducible (on irc.oftc.net) to request job runs whenever sensible. Patches and other feedback are very much appreciated - if you want to help, please start by looking at the ToDo list for $1, you might find something easy to contribute." + write_page "

There is a weekly run jenkins job to test the $BRANCH branch of $PROJECTNAME.git. The jenkins job is running reproducible_$PROJECTNAME.sh$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join #debian-reproducible (on irc.oftc.net) to request job runs whenever sensible. Patches and other feedback are very much appreciated - if you want to help, please start by looking at the ToDo list for $1, you might find something easy to contribute." write_page "
Thanks to Profitbricks for donating the virtual machines this is running on!

" else write_page "

FIXME: explain $PROJECTNAME test setup here.

" @@ -334,11 +334,11 @@ write_page_footer() { if [ -n "$JOB_URL" ] ; then write_page "This page was built by the jenkins job" write_page "$(basename $JOB_URL) which is configured" - write_page "via this git repo." + write_page "via this git repo." fi write_page "There is more information about jenkins.debian.net and about reproducible builds of Debian available elsewhere." write_page "
Last update: $(date +'%Y-%m-%d %H:%M %Z'). Copyright 2014-2016 Holger Levsen and many others." - write_page "The code of jenkins.debian.net.git is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library." + write_page "The code of jenkins.debian.net.git is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library." write_page "
" if [ "$1" = "coreboot" ] ; then write_page "The Coreboot logo is Copyright © 2008 by Konsult Stuge and coresystems GmbH and can be freely used to refer to the Coreboot project." diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py index 8b653b23..f7993927 100755 --- a/bin/reproducible_html_breakages.py +++ b/bin/reproducible_html_breakages.py @@ -316,7 +316,7 @@ if __name__ == '__main__': html = '

This page lists unexpected things a human should look at and ' html += 'fix, like packages with an incoherent status or files that ' html += 'should not be there. Some of these breakages are caused by ' - html += 'bugs in diffoscope ' + html += 'bugs in diffoscope ' html += 'while others are probably due to bugs in the scripts run by jenkins. ' html += 'Please help making this page empty!

\n' breakages = gen_html() diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh index 9b72498d..194a777d 100755 --- a/bin/reproducible_html_repository_comparison.sh +++ b/bin/reproducible_html_repository_comparison.sh @@ -161,18 +161,18 @@ for PKG in $SOURCEPKGS ; do GIT="$PKG.git" case $PKG in debbindiff) - URL="http://anonscm.debian.org/cgit/reproducible/diffoscope.git" + URL="https://anonscm.debian.org/git/reproducible/diffoscope.git" GIT="diffoscope.git" ;; strip-nondeterminism|diffoscope|disorderfs) - URL="http://anonscm.debian.org/cgit/reproducible/$GIT" ;; + URL="https://anonscm.debian.org/git/reproducible/$GIT" ;; *) - URL="http://anonscm.debian.org/cgit/reproducible/$GIT/?h=pu/reproducible_builds" ;; + URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=pu/reproducible_builds" ;; esac custom_curl $URL $TMPFILE if [ "$(grep "'error'>No repositories found" $TMPFILE 2>/dev/null)" ] ; then write_row "no git repository found:
$URL" elif [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then - URL="http://anonscm.debian.org/cgit/reproducible/$GIT/?h=merged/reproducible_builds" + URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=merged/reproducible_builds" custom_curl $URL $TMPFILE if [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then if ! $OBSOLETE_IN_SID ; then diff --git a/debian/control b/debian/control index 3f25fe10..fb399e71 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9.20120419~), asciidoc Standards-Version: 3.9.1 Homepage: https://jenkins.debian.net/userContent/about.html Vcs-Git: git://git.debian.org/git/qa/jenkins.debian.net.git -Vcs-Browser: http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git +Vcs-Browser: https://anonscm.debian.org/git/qa/jenkins.debian.net.git Package: jenkins.debian.net-setup Architecture: all diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index 6a427c20..958dd549 100755 --- a/job-cfg/chroot-installation.yaml.py +++ b/job-cfg/chroot-installation.yaml.py @@ -341,7 +341,7 @@ for jobindex, jobspec in enumerate(jobspecs): data.append({'project': { 'name': 'chroot-installation', - 'do_not_edit': '

Job configuration source is chroot-installation.yaml.py.', + 'do_not_edit': '

Job configuration source is chroot-installation.yaml.py.', 'my_prio': '130', 'my_trigger': '', 'my_time': '', diff --git a/job-cfg/d-i-overview.yaml b/job-cfg/d-i-overview.yaml index 4ed4b031..9155fd49 100644 --- a/job-cfg/d-i-overview.yaml +++ b/job-cfg/d-i-overview.yaml @@ -43,7 +43,7 @@ - project: name: d-i - do_not_edit: '

Job configuration source is d-i-overview.yaml.py.' + do_not_edit: '

Job configuration source is d-i-overview.yaml.py.' arch: - amd64 - arm64 diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py index 43450e5c..1b96023f 100755 --- a/job-cfg/d-i.yaml.py +++ b/job-cfg/d-i.yaml.py @@ -454,7 +454,7 @@ data.append( 'name': 'd-i', 'do_not_edit': ( '

Job configuration source is ' - '' 'd-i.yaml.py.'), 'jobs': [ diff --git a/job-cfg/debsums-tests.yaml b/job-cfg/debsums-tests.yaml index 73a2c0bc..2265c34d 100644 --- a/job-cfg/debsums-tests.yaml +++ b/job-cfg/debsums-tests.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}

Job configuration source is debsums-tests.yaml.' + description: '{my_description}

Job configuration source is debsums-tests.yaml.' logrotate: daysToKeep: 90 numToKeep: 30 diff --git a/job-cfg/dpkg.yaml b/job-cfg/dpkg.yaml index c2d8a8c9..b1219279 100644 --- a/job-cfg/dpkg.yaml +++ b/job-cfg/dpkg.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}

Job configuration source is dpkg.yaml.' + description: '{my_description}

Job configuration source is dpkg.yaml.' logrotate: daysToKeep: 90 numToKeep: 20 diff --git a/job-cfg/edu-packages.yaml b/job-cfg/edu-packages.yaml index f20c4b3c..3421ec28 100644 --- a/job-cfg/edu-packages.yaml +++ b/job-cfg/edu-packages.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: 'Build the master branch of git://anonscm.debian.org/debian-edu/{my_package}.git in sid on every commit.

Job configuration source is edu-packages.yaml.' + description: 'Build the master branch of git://anonscm.debian.org/debian-edu/{my_package}.git in sid on every commit.

Job configuration source is edu-packages.yaml.' logrotate: daysToKeep: 90 numToKeep: 30 diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index ddbe7f1a..31c0cdac 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -196,7 +196,7 @@ - project: name: g-i-installation - do_not_edit: '

Job configuration source is g-i-installation.yaml.' + do_not_edit: '

Job configuration source is g-i-installation.yaml.' jobs: - '{name}_maintenance' - '{name}_{my_dist}_group': diff --git a/job-cfg/haskell-package-plan.yaml b/job-cfg/haskell-package-plan.yaml index 7b2bfedf..16c20ff7 100644 --- a/job-cfg/haskell-package-plan.yaml +++ b/job-cfg/haskell-package-plan.yaml @@ -64,7 +64,7 @@ - project: name: haskell-package-plan - do_not_edit: '

Job configuration source is haskell-package-plan.yaml.' + do_not_edit: '

Job configuration source is haskell-package-plan.yaml.' jobs: - '{name}': my_distro: 'sid' diff --git a/job-cfg/lintian-tests.yaml b/job-cfg/lintian-tests.yaml index 13be2b34..b25ab32b 100644 --- a/job-cfg/lintian-tests.yaml +++ b/job-cfg/lintian-tests.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}

Job configuration source is lintian-tests.yaml.' + description: '{my_description}

Job configuration source is lintian-tests.yaml.' logrotate: daysToKeep: 90 numToKeep: 30 diff --git a/job-cfg/live.yaml b/job-cfg/live.yaml index 65490538..6e24894e 100644 --- a/job-cfg/live.yaml +++ b/job-cfg/live.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}

Job configuration source is live.yaml.' + description: '{my_description}

Job configuration source is live.yaml.' logrotate: daysToKeep: 90 numToKeep: 20 diff --git a/job-cfg/lvc.yaml b/job-cfg/lvc.yaml index ce3b1770..d9969b93 100644 --- a/job-cfg/lvc.yaml +++ b/job-cfg/lvc.yaml @@ -1,7 +1,7 @@ - defaults: name: lvc project-type: freestyle - description: '{my_description}

Job configuration source is lvc.yaml.' + description: '{my_description}

Job configuration source is lvc.yaml.' properties: - sidebar: url: https://jenkins.debian.net/userContent/about.html diff --git a/job-cfg/piuparts.yaml b/job-cfg/piuparts.yaml index 337b8993..9085d36e 100644 --- a/job-cfg/piuparts.yaml +++ b/job-cfg/piuparts.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}

Job configuration source is piuparts.yaml.' + description: '{my_description}

Job configuration source is piuparts.yaml.' logrotate: daysToKeep: 90 numToKeep: 20 diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py index e1796b0c..10d332e0 100755 --- a/job-cfg/rebootstrap.yaml.py +++ b/job-cfg/rebootstrap.yaml.py @@ -110,7 +110,7 @@ for arch in sorted(architectures): print(""" - project: name: rebootstrap - do_not_edit: '

Job configuration source is rebootstrap.yaml.py.' + do_not_edit: '

Job configuration source is rebootstrap.yaml.py.' jobs:""") for arch in sorted(architectures): for gccver in sorted(gcc_versions): diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 2700939f..ac87e4dc 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: &desc '{my_description}
Job configuration source is reproducible.yaml.
Results are available at https://tests.reproducible-builds.org.' + description: &desc '{my_description}
Job configuration source is reproducible.yaml.
Results are available at https://tests.reproducible-builds.org.' triggers: - timed: '{my_timed}' logrotate: diff --git a/job-cfg/schroot.yaml b/job-cfg/schroot.yaml index 2b67ffbd..68401997 100644 --- a/job-cfg/schroot.yaml +++ b/job-cfg/schroot.yaml @@ -71,7 +71,7 @@ - project: name: schroot - do_not_edit: '

Job configuration source is schroot.yaml.' + do_not_edit: '

Job configuration source is schroot.yaml.' jobs: - 'd-i_{name}-sid-create': my_schroot: d-i-sid diff --git a/job-cfg/self.yaml b/job-cfg/self.yaml index dae08e14..d7f7f2d2 100644 --- a/job-cfg/self.yaml +++ b/job-cfg/self.yaml @@ -52,7 +52,7 @@ - project: name: self - do_not_edit: '

Job configuration source is self.yaml.' + do_not_edit: '

Job configuration source is self.yaml.' jobs: - '{name}_maintenance': my_shell: '/srv/jenkins/bin/maintenance.sh' diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index a74bdf27..bc760b79 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -17,7 +17,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}
Job configuration source is torbrowser-launcher.yaml.
Results are available at https://torbrowser-launcher.debian.net.' + description: '{my_description}
Job configuration source is torbrowser-launcher.yaml.
Results are available at https://torbrowser-launcher.debian.net.' logrotate: daysToKeep: 90 numToKeep: 30 @@ -53,7 +53,7 @@ option: category categories: - torbrowser-launcher - description: '{my_description}
Job configuration source is torbrowser-launcher.yaml.
Results are available at https://torbrowser-launcher.debian.net.' + description: '{my_description}
Job configuration source is torbrowser-launcher.yaml.
Results are available at https://torbrowser-launcher.debian.net.' logrotate: daysToKeep: 90 numToKeep: 20 @@ -101,7 +101,7 @@ option: category categories: - torbrowser-launcher - description: '{my_description}
Job configuration source is torbrowser-launcher.yaml.
Results are available at https://torbrowser-launcher.debian.net.' + description: '{my_description}
Job configuration source is torbrowser-launcher.yaml.
Results are available at https://torbrowser-launcher.debian.net.' logrotate: daysToKeep: 90 numToKeep: 20 diff --git a/job-cfg/udd.yaml b/job-cfg/udd.yaml index 6fb8f348..fad573f5 100644 --- a/job-cfg/udd.yaml +++ b/job-cfg/udd.yaml @@ -14,7 +14,7 @@ url: http://www.profitbricks.co.uk text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png - description: '{my_description}

Job configuration source is udd.yaml.' + description: '{my_description}

Job configuration source is udd.yaml.' logrotate: daysToKeep: 90 numToKeep: 20 -- cgit v1.2.3-70-g09d2