[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: more salsa related URL updates
Holger Levsen
gitlab at salsa.debian.org
Sat Jun 2 10:55:22 BST 2018
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
b3200bc9 by Holger Levsen at 2018-06-02T09:54:37+00:00
reproducible Debian: more salsa related URL updates
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
0b4cb6a2 by Holger Levsen at 2018-06-02T09:55:10+00:00
reproducible Debian: update for salsa (untested, might still be broken, as it parse HTML output…)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
7 changed files:
- INSTALL
- README
- bin/reproducible_common.sh
- bin/reproducible_html_repository_comparison.sh
- debian/control
- debian/copyright
- mustache-templates/reproducible/default_page_footer.mustache
Changes:
=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -70,7 +70,7 @@ We would prefer to run a jenkins package from jessie-backports.
As user run:
----
cd
-git clone https://salsa.debian.org:qa/jenkins.debian.net
+git clone https://salsa.debian.org/qa/jenkins.debian.net
cd jenkins.debian.net
./update_jdn.sh
----
@@ -140,7 +140,7 @@ I've cloned these two git repos on my desktop and manually run `git pull`. This
If you'd like to run tests.repoducible-builds.org without the rest of the jenkins set up, here are some necessary steps. Note that most of these steps are performed in the update_jdn.sh script, so if you have a test system it might be simpler to just run it.
-Your clone of the jenkins git (https://salsa.debian.org:qa/jenkins.debian.net) will be referred to as $JENKINSGIT.
+Your clone of the jenkins git (https://salsa.debian.org/qa/jenkins.debian.net) will be referred to as $JENKINSGIT.
==== Dependencies, users, directories and files
=====================================
README
=====================================
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ About jenkins.debian.net
https://jenkins.debian.net is a tool for automated quality monitoring of Debian. It is *work in progress* despite being in existence since October 15th 2012.
-Get the source by running `git clone https://salsa.debian.org:qa/jenkins.debian.net`. It's all in there, no (relevant) manual setup has been done besides what's in this git repository. (The irrelevant bits are some very simple configuration files containing passwords.)
+Get the source by running `git clone https://salsa.debian.org/qa/jenkins.debian.net`. It's all in there, no (relevant) manual setup has been done besides what's in this git repository. (The irrelevant bits are some very simple configuration files containing passwords.)
The (virtualized) hardware is sponsored since October 2012 by http://www.profitbricks.co.uk - currently it's using more than hundred cores and almost 300 GB memory, thanks a lot!
=====================================
bin/reproducible_common.sh
=====================================
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2017 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2018 Holger Levsen <holger at layer-acht.org>
# © 2015 Mattia Rizzolo <mattia at mapreri.org>
# released under the GPLv=2
#
@@ -355,7 +355,7 @@ write_page_intro() {
fi
if [ "$1" != "Arch Linux" ] && [ "$1" != "fedora-23" ] ; then
local SMALLPROJECTNAME="$(echo $PROJECTNAME|tr '[:upper:]' '[:lower:]')"
- write_page " <p>There is a weekly run <a href=\"https://jenkins.debian.net/view/reproducible/job/reproducible_$SMALLPROJECTNAME/\">jenkins job</a> to test the <code>$BRANCH</code> branch of <a href=\"$PROJECTURL\">$PROJECTNAME.git</a>. The jenkins job is running <a href=\"https://anonscm.debian.org/git/qa/jenkins.debian.net.git/tree/bin/reproducible_$SMALLPROJECTNAME.sh\">reproducible_$SMALLPROJECTNAME.sh</a>$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join <code>#reproducible-builds</code> (on irc.oftc.net) to request job runs whenever sensible. Patches and other <a href=\"mailto:reproducible-builds at lists.alioth.debian.org\">feedback</a> are very much appreciated - if you want to help, please start by looking at the <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_$(echo $1|tr '[:upper:]' '[:lower:]')\">ToDo list for $1</a>, you might find something easy to contribute."
+ write_page " <p>There is a weekly run <a href=\"https://jenkins.debian.net/view/reproducible/job/reproducible_$SMALLPROJECTNAME/\">jenkins job</a> to test the <code>$BRANCH</code> branch of <a href=\"$PROJECTURL\">$PROJECTNAME.git</a>. The jenkins job is running <a href=\"https://salsa.debian.org/qa/jenkins.debian.net/tree/master/bin/reproducible_$SMALLPROJECTNAME.sh\">reproducible_$SMALLPROJECTNAME.sh</a>$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join <code>#reproducible-builds</code> (on irc.oftc.net) to request job runs whenever sensible. Patches and other <a href=\"mailto:reproducible-builds at lists.alioth.debian.org\">feedback</a> are very much appreciated - if you want to help, please start by looking at the <a href=\"https://jenkins.debian.net/userContent/todo.html#_reproducible_$(echo $1|tr '[:upper:]' '[:lower:]')\">ToDo list for $1</a>, you might find something easy to contribute."
write_page " <br />Thanks to <a href=\"https://www.profitbricks.co.uk\">Profitbricks</a> for donating the virtual machines this is running on!</p>"
elif [ "$1" = "fedora-23" ] ; then
write_page " <p><img src=\"/userContent/static/weather-storm.png\"> FIXME: explain $PROJECTNAME test setup here.</p>"
=====================================
bin/reproducible_html_repository_comparison.sh
=====================================
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2015-2017 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2018 Holger Levsen <holger at layer-acht.org>
# released under the GPLv=2
DEBUG=false
@@ -156,12 +156,12 @@ for PKG in $SOURCEPKGS ; do
write_row "<tr><td><pre>src:$PKG</pre></td>"
write_row " <td>"
GIT="$PKG.git"
- URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=pu/reproducible_builds"
+ URL="https://salsa.debian.org/reproducible-builds/packages/$PKG/tree/pu/reproducible_builds"
custom_curl $URL $TMPFILE
if [ "$(grep "'error'>No repositories found" $TMPFILE 2>/dev/null)" ] ; then
write_row "<span class=\"red\">no git repository found:</span><br />$URL"
elif [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then
- URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=merged/reproducible_builds"
+ URL="https://salsa.debian.org/reproducible-builds/packages/$PKG/tree/merged/reproducible_builds"
custom_curl $URL $TMPFILE
if [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then
if ! $OBSOLETE_IN_SID ; then
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Holger Levsen <holger at debian.org>
Build-Depends: debhelper (>= 9.20120419~), asciidoc
Standards-Version: 3.9.1
Homepage: https://jenkins.debian.net/userContent/about.html
-Vcs-Git: https://salsa.debian.org:qa/jenkins.debian.net
+Vcs-Git: https://salsa.debian.org/qa/jenkins.debian.net
Vcs-Browser: https://anonscm.debian.org/git/qa/jenkins.debian.net.git
Package: jenkins.debian.net-setup
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: jenkins.debian.net
Upstream-Contact: Holger Levsen <holger at debian.org>
-Source: https://salsa.debian.org:qa/jenkins.debian.net
+Source: https://salsa.debian.org/qa/jenkins.debian.net
Copyright: 2012-2017 Holger Levsen
Comment: Original author is Holger Levsen <holger at layer-acht.org>
Upstream is bunch of lunatics who don't make release tarballs publicly
=====================================
mustache-templates/reproducible/default_page_footer.mustache
=====================================
--- a/mustache-templates/reproducible/default_page_footer.mustache
+++ b/mustache-templates/reproducible/default_page_footer.mustache
@@ -3,7 +3,7 @@
<div id="page_footer">
{{#job_url}}
This page was built by the jenkins job <a href="{{job_url}}"> {{job_name}}</a>
- which is configured via this <a href="https://anonscm.debian.org/git/qa/jenkins.debian.net.git/">git repo</a>.
+ which is configured via this <a href="https://salsa.debian.org/qa/jenkins.debian.net">git repo</a>.
{{/job_url}}
There is more information
<a href="{{jenkins_url}}/userContent/about.html">about jenkins.debian.net</a>
@@ -13,7 +13,7 @@
or as a <a href="https://www.debian.org/Bugs/Reporting">bug report against the <tt>jenkins.debian.org</tt> package</a>.
Feedback about specific job results should go to their respective lists and/or the BTS.
<br />
- The code of <a href="https://anonscm.debian.org/git/qa/jenkins.debian.net.git/">jenkins.debian.net.git</a>
+ The code of <a href="https://salsa.debian.org/qa/jenkins.debian.net">jenkins.debian.net</a>
is mostly GPL-2 licensed. The weather icons are public domain and were taken from the
<a href=http://tango.freedesktop.org/Tango_Icon_Library target=_blank> Tango Icon Library</a>.
Copyright 2014-2017 <a href="mailto:holger at layer-acht.org">Holger Levsen</a>
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/78309036970d130f8c7ff89c1a6e2e4a53e91c9c...0b4cb6a2211490de939dd5070d7f4e8fd3364c72
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/78309036970d130f8c7ff89c1a6e2e4a53e91c9c...0b4cb6a2211490de939dd5070d7f4e8fd3364c72
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/20180602/b78ee5da/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list