Commit 56e6e6cf authored by Holger Levsen's avatar Holger Levsen
Browse files

tests.r-b.o/debian: drop i386. Closes: #1059492. still exists on the fs and in the db 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 934e96d7

bin/reproducible_common.sh

+9 −17
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ RELEASED_SUITES="bookworm bullseye buster stretch" 
# Debian suites not being tested anymore:

ARCHIVED_SUITES="buster stretch"

# Debian architectures being tested

ARCHS="amd64 arm64 armhf i386"

ARCHS="amd64 arm64 armhf"



# define Debian build nodes in use and whether they run in the future

. /srv/jenkins/bin/jenkins_node_definitions.sh
@@ -487,9 +487,9 @@ write_variation_table() { 
	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" = "debian" ]  ; then

		write_page "<tr><td>env LANG</td><td>LANG=\"C.UTF-8\"</td><td>on amd64: LANG=\"et_EE.UTF-8\"<br />on i386: LANG=\"de_CH.UTF-8\"<br />on arm64: LANG=\"nl_BE.UTF-8\"<br />on armhf: LANG=\"it_CH.UTF-8\"</td></tr>"

		write_page "<tr><td>env LANGUAGE</td><td>LANGUAGE=\"en_US:en\"</td><td>on amd64: LANGUAGE=\"et_EE:et\"<br />on i386: LANGUAGE=\"de_CH:de\"<br />on arm64: LANGUAGE=\"nl_BE:nl\"<br />on armhf: LANGUAGE=\"it_CH:it\"</td></tr>"

		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>on amd64: LC_ALL=\"et_EE.UTF-8\"<br />on i386: LC_ALL=\"de_CH.UTF-8\"<br />on arm64: LC_ALL=\"nl_BE.UTF-8\"<br />on armhf: LC_ALL=\"it_CH.UTF-8\"</td></tr>"

		write_page "<tr><td>env LANG</td><td>LANG=\"C.UTF-8\"</td><td>on amd64: LANG=\"et_EE.UTF-8\"<br />on arm64: LANG=\"nl_BE.UTF-8\"<br />on armhf: LANG=\"it_CH.UTF-8\"</td></tr>"

		write_page "<tr><td>env LANGUAGE</td><td>LANGUAGE=\"en_US:en\"</td><td>on amd64: LANGUAGE=\"et_EE:et\"<br />on arm64: LANGUAGE=\"nl_BE:nl\"<br />on armhf: LANGUAGE=\"it_CH:it\"</td></tr>"

		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>on amd64: LC_ALL=\"et_EE.UTF-8\"<br />on arm64: LC_ALL=\"nl_BE.UTF-8\"<br />on armhf: LC_ALL=\"it_CH.UTF-8\"</td></tr>"

	elif [ "$1" = "Arch Linux" ]  ; then

		write_page "<tr><td>env LANG</td><td><em>LANG=\"en_US.UTF-8\"</em></td><td>LANG=\"et_EE.UTF-8\"</td></tr>"

		write_page "<tr><td>env LC_ALL</td><td><em>LANG=\"en_US.UTF-8\"</em></td><td>LC_ALL=\"et_EE.UTF-8\"</td></tr>"
@@ -518,7 +518,7 @@ write_variation_table() { 
		write_page "<tr><td>build path</td><td colspan=\"2\">/build/reproducible-path/\$pkg-\$ver <em>(not varied anymore)</em></td></tr>"

		write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"

		write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"

		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />&nbsp;&nbsp;XXX on amd64: 16 or 15<br />&nbsp;&nbsp;XXX on i386: 16 or 8<br />&nbsp;&nbsp;XXX on armhf: 5 or 3</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY on amd64: 16 or 15 (!= the first build)<br />&nbsp;&nbsp;YYY on i386: 15 or 7 (!= the first build)<br />&nbsp;&nbsp;YYY is the same as XXX on arm64<br />&nbsp;&nbsp;YYY on armhf: 2, 4, or 6</td></tr>"

		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />&nbsp;&nbsp;XXX on amd64: 16 or 15<br />&nbsp;&nbsp;XXX on armhf: 5 or 3</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY on amd64: 16 or 15 (!= the first build)<br />&nbsp;&nbsp;YYY is the same as XXX on arm64<br />&nbsp;&nbsp;YYY on armhf: 2, 4, or 6</td></tr>"

		write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"

	elif [ "$1" = "Arch Linux" ]  ; then

		write_page "<tr><td>env USER</td><td>jenkins</td><td>build 2</td></tr>"
@@ -544,7 +544,7 @@ write_variation_table() { 
				write_page "$(cat /srv/reproducible-results/node-information/*$a* | grep KERNEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"

			done

			write_page "</td>"

			write_page "<td>on amd64 and armhf systematically varied, on i386 and arm64 not at all<br />"

			write_page "<td>on amd64 and armhf systematically varied, on arm64 not at all<br />"

			for a in ${ARCHS} ; do

				write_page "<br />on $a one of:"

				write_page "$(cat /srv/reproducible-results/node-information/*$a* | grep KERNEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
@@ -569,8 +569,8 @@ write_variation_table() { 
	local TODAY=$(date +'%Y-%m-%d')

	local FUTURE=$(date --date="${TODAY}+398 days" +'%Y-%m-%d')

	if [ "$1" = "debian" ] ; then

		write_page "<tr><td>CPU type</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep CPU_MODEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')</td><td>on i386: systematically varied (AMD or Intel CPU with different names & features)<br />on amd64: same for both builds<br />on arm64: always the same<br />on armhf: sometimes varied (depending on the build job), but only the minor CPU revision</td></tr>"

		write_page "<tr><td>year, month, date</td><td>today (${TODAY}) or (on amd64, i386 and arm64 only) also: $FUTURE</td><td>on amd64, i386 and arm64: varied (398 days difference)<br />on armhf: same for both builds (currently, work in progress)</td></tr>"

		write_page "<tr><td>CPU type</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep CPU_MODEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')</td><td>on amd64: same for both builds<br />on arm64: always the same<br />on armhf: sometimes varied (depending on the build job), but only the minor CPU revision</td></tr>"

		write_page "<tr><td>year, month, date</td><td>today (${TODAY}) or (on amd64 and arm64 only) also: $FUTURE</td><td>on amd64 and arm64: varied (398 days difference)<br />on armhf: same for both builds (currently, work in progress)</td></tr>"

	else

		write_page "<tr><td>CPU type</td><td>$(cat /proc/cpuinfo|grep 'model name'|head -1|cut -d ":" -f2-)</td><td>same for both builds</td></tr>"

		if [ "$1" = "Arch Linux" ]; then
@@ -588,7 +588,7 @@ write_variation_table() { 
	fi

	if [ "$1" != "FreeBSD" ] ; then

		if [ "$1" = "debian" ] ; then

			write_page "<tr><td>hour, minute</td><td>at least the minute will probably vary between two builds anyway...</td><td>on amd64, i386 and arm64 the \"future builds\" additionally run 6h and 23min ahead</td></tr>"

			write_page "<tr><td>hour, minute</td><td>at least the minute will probably vary between two builds anyway...</td><td>on amd64 and arm64 the \"future builds\" additionally run 6h and 23min ahead</td></tr>"

		else

			write_page "<tr><td>hour, minute</td><td>hour and minute will probably vary between two builds...</td><td>the future system actually runs 398 days, 6 hours and 23 minutes ahead...</td></tr>"

		fi
@@ -823,9 +823,6 @@ create_debian_png_from_table() { 
	if [ "$ARCH" = "armhf" ] ; then

		# armhf was only build since 2015-08-30

		WHERE2_EXTRA="WHERE s.datum >= '2015-08-30'"

	elif [ "$ARCH" = "i386" ] ; then

		# i386 was only build since 2016-03-28

		WHERE2_EXTRA="WHERE s.datum >= '2016-03-28'"

	elif [ "$ARCH" = "arm64" ] ; then

		# arm63 was only build since 2016-12-23

		WHERE2_EXTRA="WHERE s.datum >= '2016-12-23'"
@@ -844,11 +841,6 @@ create_debian_png_from_table() { 
				# unstable/armhf was only build since 2015-08-30 (and experimental/armhf since 2015-12-19 and stretch/armhf since 2016-01-01)

				WHERE_EXTRA="$WHERE_EXTRA AND datum >= '2015-08-30'"

			fi

		elif [ "$ARCH" = "i386" ]  ; then

			if [ $1 -eq 2 ] ; then

				# i386 was only build since 2016-03-28

				WHERE_EXTRA="$WHERE_EXTRA AND datum >= '2016-03-28'"

			fi

		elif [ "$ARCH" = "arm64" ]  ; then

			if [ $1 -eq 2 ] ; then

				# arm64 was only build since 2016-12-23

bin/reproducible_html_pkg_sets.py

+0 −4
Original line number Diff line number Diff line
@@ -291,10 +291,6 @@ def create_pkgset_graph(png_file, suite, arch, pkgset_name): 
    columns = ["datum", "reproducible", "FTBR", "FTBFS", "other"]

    where = "WHERE suite = '%s' AND architecture = '%s' AND meta_pkg = '%s'" % \

            (suite, arch, pkgset_name)

    if arch == 'i386':

        # i386 only has pkg sets since later to make nicer graphs

        # (date added in commit 7f2525f7)

        where += " AND datum >= '2016-05-06'"

    query = "SELECT {fields} FROM {table} {where} ORDER BY datum".format(

        fields=", ".join(columns), table=table, where=where)

    result = query_db(query)

hosts/jenkins/etc/apache2/reproduciblemap.conf

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$ 
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/experimental/amd64/%2.html -f

RewriteRule ^/redirect /debian/rb-pkg/experimental/amd64/%2.html? [R=302,L]



# redirect t.r-b.o/$suite/(amd64|arm64|armhf|i386)/$PKG → t.r-b.o/rb-pkg/$suite/$arch/$PKG.html

# redirect t.r-b.o/$suite/(amd64|arm64|armhf)/$PKG → t.r-b.o/rb-pkg/$suite/$arch/$PKG.html

RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f

RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d

RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/$2/$3/$4.html -f
@@ -103,11 +103,11 @@ RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie| 
RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]



# redirect /$suite/$arch to $suite/index_suite_$arch_stats.html

RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$

RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie|unstable|experimental)/(amd64|arm64|armhf)(/|)$

RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]



# redirect /$arch to /unstable/index_suite_$arch_stats.html

RewriteCond %{REQUEST_URI} ^/(debian/|)(amd64|arm64|armhf|i386)(/|)$

RewriteCond %{REQUEST_URI} ^/(debian/|)(amd64|arm64|armhf)(/|)$

RewriteRule ^/(debian/|)([a-z0-9]+) /debian/unstable/index_suite_$2_stats.html [R,L]



# redirect /coreboot/ to coreboot/coreboot.html