[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible Arch Linux: correctly spell project name
Holger Levsen
holger at moszumanska.debian.org
Mon Oct 19 06:44:14 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 3bfe6d5f28e8edff763682659567cabc21382ff3
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Oct 19 08:41:21 2015 +0200
reproducible Arch Linux: correctly spell project name
---
bin/reproducible_arch_schroot_setup.sh | 4 ++--
bin/reproducible_build_arch_pkg.sh | 4 ++--
bin/reproducible_common.sh | 18 +++++++++---------
bin/reproducible_html_archlinux.sh | 10 +++++-----
job-cfg/reproducible.yaml | 8 ++++----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_arch_schroot_setup.sh
index ea6786c..dffe7ff 100755
--- a/bin/reproducible_arch_schroot_setup.sh
+++ b/bin/reproducible_arch_schroot_setup.sh
@@ -18,7 +18,7 @@ ARCH_MIRROR=http://mirror.one.com/archlinux/
bootstrap() {
# define URL for bootstrap.tgz
BOOTSTRAP_BASE=$ARCH_MIRROR/iso/
- echo "$(date -u) - downloading Archlinux latest/sha1sums.txt"
+ echo "$(date -u) - downloading Arch Linux latest/sha1sums.txt"
BOOTSTRAP_DATE=$(curl $BOOTSTRAP_BASE/latest/sha1sums.txt 2>/dev/null| grep x86_64.tar.gz| cut -d " " -f3|cut -d "-" -f3|egrep '[0-9.]{9}')
if [ -z $BOOTSTRAP_DATE ] ; then
echo "Cannot determine version of boostrap file, aborting."
@@ -26,7 +26,7 @@ bootstrap() {
exit 1
fi
BOOTSTRAP_TAR_GZ=$BOOTSTRAP_DATE/archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz
- echo "$(date -u) - downloading Archlinux bootstrap.tar.gz."
+ echo "$(date -u) - downloading Arch Linux bootstrap.tar.gz."
curl -O $BOOTSTRAP_BASE/$BOOTSTRAP_TAR_GZ
tar xzf archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz
mv root.x86_64/* $SCHROOT_TARGET || true # proc and sys have 0555 perms, thus mv will fail... also see below
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index be634fa..bf775e6 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -40,7 +40,7 @@ handle_remote_error() {
first_build() {
echo "============================================================================="
- echo "Building ${SRCPACKAGE} for Archlinux on $(hostname -f) now."
+ echo "Building ${SRCPACKAGE} for Arch Linux on $(hostname -f) now."
echo "Date: $(date)"
echo "Date UTC: $(date -u)"
echo "============================================================================="
@@ -67,7 +67,7 @@ first_build() {
second_build() {
echo "============================================================================="
- echo "Re-Building ${SRCPACKAGE} for Archlinux on $(hostname -f) now."
+ echo "Re-Building ${SRCPACKAGE} for Arch Linux on $(hostname -f) now."
echo "Date: $(date)"
echo "Date UTC: $(date -u)"
echo "============================================================================="
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 84ff0e8..606c85b 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -199,7 +199,7 @@ write_page_header() {
write_page " or <a href="mailto:reproducible-builds at lists.alioth.debian.org">send us an email</a>,"
write_page " to get support for making sure your packages build reproducibly too. Also, we care about free software in general,"
write_page " so if you are an upstream developer or working on another distribution, we'd love to hear from you!"
- write_page " Besides Debian we are also testing <li><a href=\"/coreboot/\">coreboot</a></li>, <li><a href=\"/openwrt/\">OpenWrt</a></li>, <li><a href=\"netbsd\">NetBSD</a></li>, <li><a href=\"/freebsd/\">FreeBSD</a></li> and <li><a href=\"archlinux\">Archlinux</a></li> now, though not as thoroughly as Debian (yet?) - and there are plans to test <a href=\"$JENKINS_URL/userContent/todo.html#_reproducible_fedora\">Fedora</a> too.</ul>"
+ write_page " Besides Debian we are also testing <li><a href=\"/coreboot/\">coreboot</a></li>, <li><a href=\"/openwrt/\">OpenWrt</a></li>, <li><a href=\"netbsd\">NetBSD</a></li>, <li><a href=\"/freebsd/\">FreeBSD</a></li> and <li><a href=\"archlinux\">Arch Linux</a></li> now, though not as thoroughly as Debian (yet?) - and there are plans to test <a href=\"$JENKINS_URL/userContent/todo.html#_reproducible_fedora\">Fedora</a> too.</ul>"
write_page " <ul>As we think that reproducible builds should become the norm, we have started to write <li><a href=\"https://reproducible-builds.org/howto\">How to make your software reproducible</a></li>. As always we appreciate feedback on this document, just please don't consider it to be finished, comprehensive or correct, yet."
write_page " Also aimed at the free software world at large, but released as version 1.0, is the first specication we have written: the <li><a href=\"https://reproducible-builds.org/specs/source-date-epoch/\">SOURCE_DATE_EPOCH specification</a></li>.</ul>"
fi
@@ -288,11 +288,11 @@ write_page_intro() {
local PROJECTURL="https://github.com/freebsd/freebsd.git"
local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD 10.1 system"
local BRANCH="release/10.2.0"
- elif [ "$1" = "Archlinux" ] ; then
+ elif [ "$1" = "Arch Linux" ] ; then
write_page " <em>Reproducible $1</em> is an effort to apply this to $1. Thus $1 packages are build twice, with a few varitations added and then the resulting packages from the two builds are then compared using <a href=\"https://tracker.debian.org/diffoscope\">diffoscope</a>. Please note that the toolchain is not varied at all as the rebuild happens on exactly the same system. More variations are expected to be seen in the wild.</p>"
- local PROJECTNAME="Archlinux"
+ local PROJECTNAME="Arch Linux"
fi
- if [ "$1" != "Archlinux" ] ; then
+ if [ "$1" != "Arch Linux" ] ; then
write_page " <p>There is a weekly run <a href=\"https://jenkins.debian.net/view/reproducible/job/reproducible_$PROJECTNAME/\">jenkins job</a> to test the <code>$BRANCH</code> branch of <a href=\"$PROJECTURL\">$PROJECTNAME.git</a>. Currently this job is triggered more often though, because this is still under development and brand new. The jenkins job is running <a href=\"http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/bin/reproducible_$PROJECTNAME.sh\">reproducible_ [...]
else
write_page " <p>This is brand new and the test setup needs to be explained here.</p>"
@@ -307,7 +307,7 @@ write_page_footer() {
write_page "NetBSD® is a registered trademark of The NetBSD Foundation, Inc."
elif [ "$1" = "FreeBSD" ] ; then
write_page "FreeBSD is a registered trademark of The FreeBSD Foundation. The FreeBSD logo and The Power to Serve are trademarks of The FreeBSD Foundation."
- elif [ "$1" = "Archlinux" ] ; then
+ elif [ "$1" = "Arch Linux" ] ; then
write_page "The <a href=\"https://www.archlinux.org\">Arch Linux</a> name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis."
fi
write_page "</p></body></html>"
@@ -328,17 +328,17 @@ write_explaination_table() {
write_page "<tr><td>hostname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
write_page "<tr><td>domainname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
fi
- if [ "$1" != "FreeBSD" ] && [ "$1" != "Archlinux" ] ; then
+ if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then
write_page "<tr><td>env CAPTURE_ENVIRONMENT</td><td><em>not set</em></td><td>CAPTURE_ENVIRONMENT=\"I capture the environment\"</td></tr>"
fi
write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>"
- if [ "$1" = "Archlinux" ] ; then
+ if [ "$1" = "Arch Linux" ] ; then
write_page "<tr><td>env LANG</td><td>LANG<em>not set</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
else
write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
fi
write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>"
- if [ "$1" != "FreeBSD" ] && [ "$1" != "Archlinux" ] ; then
+ if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then
write_page "<tr><td>env PATH</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:\"</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path\"</td></tr>"
else
write_page "<tr><td>env PATH</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
@@ -362,7 +362,7 @@ write_explaination_table() {
if [ "$1" != "FreeBSD" ] ; then
if [ "$1" = "debian" ] ; then
write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td></td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br /> ')</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL2 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br /> ')</td></tr>"
- elif [ "$1" != "Archlinux" ] ; then
+ elif [ "$1" != "Arch Linux" ] ; then
write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td><td>$(uname -sr)</td><td>$(/usr/bin/linux64 --uname-2.6 uname -sr)</td></tr>"
else
write_page "<tr><td>kernel version</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index e527742..d686595 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -22,19 +22,19 @@ cat > $PAGE <<- EOF
<html lang="en-US">
<head>
<meta charset="UTF-8">
- <title>Repoducible Archlinux ?</title>
+ <title>Repoducible Arch Linux ?</title>
<link rel='stylesheet' href='/freebsd/global.css' type='text/css' media='all' />
</head>
<body>
<div id="logo">
- <h1>Reproducible Archlinux?</h1>
+ <h1>Reproducible Arch Linux?</h1>
</div>
<div class="content">
<div class="page-content">
EOF
-write_page_intro Archlinux
-write_explaination_table Archlinux
+write_page_intro 'Arch Linux'
+write_explaination_table 'Arch Linux'
write_page " <table><tr><th>source package</th><th>test date</th><th>1st build log</th><th>2nd build log</th><th>diffoscope output for binary packages</th></tr>"
for PKG in $(find $ARCHBASE/* -maxdepth 1 -type d -exec basename {} \;) ; do
write_page " <tr>"
@@ -74,5 +74,5 @@ for PKG in $(find $ARCHBASE/* -maxdepth 1 -type d -exec basename {} \;) ; do
done
write_page " </table>"
write_page "</div></div>"
-write_page_footer Archlinux
+write_page_footer 'Arch Linux'
echo "$(date -u) - enjoy $REPRODUCIBLE_URL/archlinux/$PAGE"
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index ad46427..3ac24f9 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -1315,27 +1315,27 @@
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
my_node: ''
- '{name}_setup_schroot_arch':
- my_description: 'Setup an Archlinux schroot to test Archlinux packages for reproducibility.' # FIXME: this aint idempotent, so it's only run once a year for now
+ my_description: 'Setup an Arch Linux schroot to test Arch Linux packages for reproducibility.' # FIXME: this aint idempotent, so it's only run once a year for now
my_timed: '42 23 1 1 *'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
my_node: 'profitbricks3'
- '{name}_builder_arch_1':
- my_description: 'Try to reproducibly build an Archlinux package.'
+ my_description: 'Try to reproducibly build an Arch Linux package.'
my_timed: '* * * * *'
my_trigger: 'reproducible_html_archlinux'
my_shell: '/srv/jenkins/bin/reproducible_build_arch_pkg.sh'
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
my_node: ''
- '{name}_builder_arch_2':
- my_description: 'Try to reproducibly build an Archlinux package.'
+ my_description: 'Try to reproducibly build an Arch Linux package.'
my_timed: '* * * * *'
my_trigger: 'reproducible_html_archlinux'
my_shell: '/srv/jenkins/bin/reproducible_build_arch_pkg.sh'
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
my_node: ''
- '{name}_html_archlinux':
- my_description: 'Build a simple webpage for Archlinux reproducibility tests'
+ my_description: 'Build a simple webpage for Arch Linux reproducibility tests'
my_timed: ''
my_shell: '/srv/jenkins/bin/reproducible_html_archlinux.sh'
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
--
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