s#reproducible.debian.net#tests.reproducible-builds.org#g in many but not all places yet

8 files changed, 19 insertions, 12 deletions

diff --git a/README b/README
index a077ec2b..65c3fcad 100644
--- a/README
+++ b/README
@@ -133,9 +133,9 @@ Installation tests inside chroot environments.
 
 * See https://wiki.debian.org/ReproducibleBuilds to learn more about "Reproducible Builds" in Debian and beyond.
 
-* Several jobs are being used to assemble the website https://reproducible.debian.net which is actually a collection of static html and log files (and very few images) being served from this host. Besides the logfiles data is stored in an SQLite database which can be downloaded from https://reproducible.debian.net/reproducible.db. (That copy is updated every four hours.)
+* Several jobs are being used to assemble the website https://tests.reproducible-builds.org which is actually a collection of static html and log files (and very few images) being served from this host. Besides the logfiles data is stored in an SQLite database which can be downloaded from https://reproducible.debian.net/reproducible.db. (That copy is updated every four hours.)
 
-* The (current) purpose of https://reproducible.debian.net is to show the prospects of reproducible builds for Debian. IOW: this is research, showing what could (and should) be done... check https://wiki.debian.org/ReproducibleBuilds for the real status of the project!
+* The (current) purpose of https://tests.reproducible-builds.org is to show the prospects of reproducible builds for Debian - and six other projects currently. This is research, showing what could (and should) be done... check https://wiki.debian.org/ReproducibleBuilds for the real status of the project for Debian!
 
 * Currently, three suites are tested on 'amd64' and 'armhf' architectures: 'testing', 'unstable' and 'experimental'. The tests are done using 'pbuilder' using link:https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain[our toolchain] through concurrent builder jobs, 32 for 'amd64' and 34 for 'armhf', which are each constantly testing packages and saving the results of these tests.
 
@@ -188,7 +188,7 @@ usage: reproducible_setup_notify.py [-h] [-o] [-p PACKAGES [PACKAGES ...]]
 
 * Job configuration is at the usual location for 'jenkins.debian.net': there's a 'job-cfg/reproducible.yaml' defining all the jobs and lots of scripts in 'bin/reproducible_*.(sh|py)', plus a few config files like for 'sudo' or 'apache2'.
 
-* Finally, there are also jobs testing the link:http://www.coreboot.org/[coreboot], link:https://openwrt.org/[OpenWrt], link:http://www.netbsd.org/[NetBSD] and https://www.freebsd.org/[FreeBSD] projects. The results of the tests can be seen respectively at https://reproducible.debian.net/coreboot/, https://reproducible.debian.net/openwrt/, https://reproducible.debian.net/netbsd/ and https://reproducible.debian.net/freebsd/.
+* Finally, there are also jobs testing the link:http://www.coreboot.org/[coreboot], link:https://openwrt.org/[OpenWrt], link:http://www.netbsd.org/[NetBSD] and https://www.freebsd.org/[FreeBSD] projects. The results of the tests can be seen respectively at https://tests.reproducible-builds.org/coreboot/, https://tests.reproducible-builds.org/openwrt/, https://tests.reproducible-builds.org/netbsd/ and https://tests.reproducible-builds.org/freebsd/.
 
 
 === jenkins.d.n jobs
diff --git a/THANKS.head b/THANKS.head
index 6d313ced..7db7cc13 100644
--- a/THANKS.head
+++ b/THANKS.head
@@ -15,7 +15,7 @@
  ** nine quad-cores with 2 GB RAM each,
  ** two quad-cores with 1 GB RAM and
  ** three dual-cores with 1 GB RAM.
- * link:https://letsencrypt.org[Let's encrypt] provides free of charge SSL certificates for both jenkins.debian.net and reproducible.debian.net.
+ * link:https://letsencrypt.org[Let's encrypt] provides free of charge SSL certificates for jenkins.debian.net, reproducible.debian.net and tests.reproducible-builds.org.
 
 ==== Past sponsors
 
diff --git a/TODO b/TODO
index 72eb67ec..a9fb2ff0 100644
--- a/TODO
+++ b/TODO
@@ -65,7 +65,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 *** as we dont want irc nor mail notifications for this during the migration, we should disable those with an easily revertable commit before actual deployment
 *** then rename jenkins.debian.net to profitbricks-build0-amd64 - and switch all the jobs which used to run on the master node on that node, which already has the right sudoers, usercontent/reproducible/ and reproducible.db
 *** some authorized_keys will also need to be adopted for the change of IP address from jenkins.d.n to jenkins.d.o
-*** redirect jenkins.debian.net to jenkins.debian.org - reproducible.debian.net will stay where it is.
+*** redirect jenkins.debian.net to jenkins.debian.org - tests.reproducible-builds.org will stay where it is.
 * party!
 
 ==== proper backup
@@ -172,6 +172,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 *** move "untested" field in stats table too? (as in csv output...)
 ** blacklist script should tell if a package was already blacklisted. also proper options should be used...
 ** maintenance.sh: delete the history pages once a page has been removed from all suites+archs
+** reproducible.debian.net rename: rgrep all the files…
 ** debbindiff2diffoscope rename: do s#dbd#ds#g and s#DBD#DS#g and rename dbd directories?
 ** diffoscope needs to be run on the target arch... (or rather: run on a 64bit architecture for 64bit architectures and on 32bit for 32 bit archs), this should probably be doable with a simple i386 chroot on the host (so using qemu-static to run it on armhf should not be needed, probably.)
 * support for arbitrary (to be implemented) Debian-PPAs and external repos, by just giving a source URL
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index f39e0a91..6fe77579 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -68,7 +68,7 @@ RBUILD_PATH = BASE + RBUILD_URI
 HISTORY_PATH = BASE + HISTORY_URI
 BUILDINFO_PATH = BASE + BUILDINFO_URI
 
-REPRODUCIBLE_URL = 'https://reproducible.debian.net'
+REPRODUCIBLE_URL = 'https://tests.reproducible-builds.org'
 JENKINS_URL = 'https://jenkins.debian.net'
 
 parser = argparse.ArgumentParser()
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index fa3ea0de..d0b4d6ad 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -35,7 +35,7 @@ EOF
 fi
 
 # common variables
-REPRODUCIBLE_URL=https://reproducible.debian.net
+REPRODUCIBLE_URL=https://tests.reproducible-builds.org
 REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
@@ -287,7 +287,7 @@ write_page_header() {
 
 write_page_intro() {
 	write_page "       <p><em>Reproducible builds</em> enable anyone to reproduce bit by bit identical binary packages from a given source, so that anyone can verify that a given binary derived from the source it was said to be derived."
-	write_page "         There is a lot more information about <a href=\"https://wiki.debian.org/ReproducibleBuilds\">reproducible builds on the Debian wiki</a> and on <a href=\"https://reproducible.debian.net\">https://reproducible.debian.net</a>."
+	write_page "         There is a lot more information about <a href=\"https://wiki.debian.org/ReproducibleBuilds\">reproducible builds on the Debian wiki</a> and on <a href=\"https://tests.reproducible-builds.org\">https://tests.reproducible-builds.org</a>."
 	write_page "         The wiki explains in more depth why this is useful, what common issues exist and which workarounds and solutions are known."
 	write_page "        </p>"
 	local BUILD_ENVIRONMENT=" in a Debian environment"
diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py
index 12c9de3d..8b653b23 100755
--- a/bin/reproducible_html_breakages.py
+++ b/bin/reproducible_html_breakages.py
@@ -325,7 +325,7 @@ if __name__ == '__main__':
     else:
         html += '<p><b>COOL!!!</b> Everything is GOOD and not a single issue was '
         html += 'detected. <i>Enjoy!</i></p>'
-    title = 'Breakage on reproducible.debian.net'
+    title = 'Breakage on the Debian pages of tests.reproducible-builds.org'
     destfile = BASE + '/index_breakages.html'
     desturl = REPRODUCIBLE_URL + '/index_breakages.html'
     write_html_page(title, html, destfile, style_note=True)
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 95d7e499..151fcd91 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -46,10 +46,16 @@ ${suites_links}
     <ul class="reproducible-links">
         Reproducible Builds projects links
         <li>
-            reproducible.debian.net - <a href="%s">Dashboard</a><br />
+            tests.reproducible-builds.org - <a href="%s">Debian Dashboard</a><br />
             Reproducible Debian - <a href="https://wiki.debian.org/ReproducibleBuilds">Wiki</a><br />
             Reproducible-builds.org - <a href="https://Reproducible-builds.org/docs/">HowTo</a><br />
-            <a href="https://Reproducible-builds.org">Reproducible-builds.org</a>
+            <a href="https://Reproducible-builds.org">Reproducible-builds.org</a><br />
+            Reproducible <a href="https://tests.reproducible-builds.org/archlinux/">Archlinux</a> /
+            <a href="https://tests.reproducible-builds.org/coreboot/">coreboot</a> /
+            <a href="https://tests.reproducible-builds.org/fedora/">Fedora</a> /
+            <a href="https://tests.reproducible-builds.org/freebsd/">FreeBSD</a> /
+            <a href="https://tests.reproducible-builds.org/netbsd/">NetBSD</a> /
+            <a href="https://tests.reproducible-builds.org/openwrt/">OpenWrt</a>
         </li>
     </ul>
 </header>
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index d832dc26..d1eee4dc 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}<br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/reproducible.yaml">reproducible.yaml</a>.<br>Results are available at <a href="https://reproducible.debian.net/">https://reproducible.debian.net</a>.'
+    description: &desc '{my_description}<br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/reproducible.yaml">reproducible.yaml</a>.<br>Results are available at <a href="https://tests.reproducible-builds.org/">https://tests.reproducible-builds.org</a>.'
     triggers:
       - timed: '{my_timed}'
     logrotate: