From 6b26c8714197c3cc2f1b55fa9f33f7818c9516de Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 28 Apr 2021 08:16:00 -0700 Subject: [PATCH] reproducible Debian: Disable creation of stretch pbuilder tarballs and update README to mention builds on bullseye instead of stretch. --- README | 2 +- bin/jenkins_node_wrapper.sh | 2 -- job-cfg/reproducible.yaml | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README b/README index 3addd8e35..d234058ce 100644 --- a/README +++ b/README @@ -118,7 +118,7 @@ Installation tests inside chroot environments. * The (current) purpose of https://tests.reproducible-builds.org is to show the potential 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! -* For Debian, four suites, 'stretch', 'buster', 'unstable' and 'experimental', are tested on four architectures: 'amd64', 'i386', 'arm64' and 'armhf'. The tests are done using 'pbuilder' through several concurrent workers: 40 for 'amd64', 24 for 'i386', 32 for 'arm64' and 55 for 'armhf', which are each constantly testing packages and saving the results of these tests. There's a single link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build_service.sh[systemd service] starting all of these link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_worker.sh[workers] which in turn launch the actual link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build.sh[build script]. (So the actual builds and tests are happening outside the jenkins service.) +* For Debian, four suites, 'buster', 'bullseye', 'unstable' and 'experimental', are tested on four architectures: 'amd64', 'i386', 'arm64' and 'armhf'. The tests are done using 'pbuilder' through several concurrent workers: 40 for 'amd64', 24 for 'i386', 32 for 'arm64' and 55 for 'armhf', which are each constantly testing packages and saving the results of these tests. There's a single link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build_service.sh[systemd service] starting all of these link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_worker.sh[workers] which in turn launch the actual link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build.sh[build script]. (So the actual builds and tests are happening outside the jenkins service.) ** To shutdown all the workers use: `sudo systemctl stop reproducible_build@startup.service ; /srv/jenkins/bin/reproducible_cleanup_nodes.sh` ** To start all the workers use: `sudo systemctl start reproducible_build@startup.service` diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index 489d123b5..f3eaa20a9 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -126,8 +126,6 @@ elif [[ "$*" =~ ^rm\ -r\ /srv/reproducible-results/archlinuxrb-build.* ]] ; then exec rm -r "$3" ; croak "Exec failed"; elif [[ "$*" =~ ^rm\ -r\ /var/lib/jenkins/jobs/.*/workspace/results ]] ; then exec rm -r "$3" ; croak "Exec failed"; -elif [[ "$*" =~ ^reproducible_setup_pbuilder_stretch_.*_.* ]] ; then - exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh stretch ; croak "Exec failed"; elif [[ "$*" =~ ^reproducible_setup_pbuilder_buster_.*_.* ]] ; then exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh buster ; croak "Exec failed"; elif [[ "$*" =~ ^reproducible_setup_pbuilder_bullseye_.*_.* ]] ; then diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index e1daefa73..2f99a35b8 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -417,9 +417,6 @@ - '{name}_{my_task}_{my_arch}_{my_hname}': my_task: - - 'setup_pbuilder_stretch': - my_description: 'Setup pbuilder for reproducible builds of packages from stretch as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' - my_timed: '23 7 1 * *' - 'setup_pbuilder_buster': my_description: 'Setup pbuilder for reproducible builds of packages from buster as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' my_timed: '23 8 7,21 * *' -- GitLab