[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: add support for testing cdebootstrap too and add such a job for unstable

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
c1bd3041 by Holger Levsen at 2022-08-29T21:09:34+02:00
reproducible Debian: add support for testing cdebootstrap too and add such a job for unstable

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


4 changed files:

- bin/reproducible_debstrap.sh
- hosts/common/etc/sudoers.d/jenkins
- job-cfg/reproducible.yaml
- update_jdn.sh


Changes:

=====================================
bin/reproducible_debstrap.sh
=====================================
@@ -55,6 +55,7 @@ for LOOP in "first" "second" ; do
 			case $TOOL in
 				mmdebstrap)	REALTOOL="mmdebstrap -v" ;;
 				debootstrap)	REALTOOL="debootstrap --verbose" ;;
+				cdebootstrap)	REALTOOL="cdebootstrap --verbose" ;;
 			esac
 			;;
 	esac
@@ -75,6 +76,10 @@ for LOOP in "first" "second" ; do
 				sudo tar --mtime="@$SOURCE_DATE_EPOCH" --clamp-mtime -C $BUILDDIR/$SUBDIR/${TOOL}/ -cf $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar ${SUITE}
 				sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
 				;;
+		cdebootstrap)	sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
+				sudo tar --mtime="@$SOURCE_DATE_EPOCH" --clamp-mtime -C $BUILDDIR/$SUBDIR/${TOOL}/ -cf $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar ${SUITE}
+				sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
+				;;
 		*)		output_echo "Failure: ${TOOL} is unsupported."
 				exit 1
 				;;


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -1,6 +1,7 @@
 jenkins ALL=  \
 	NOPASSWD: /usr/sbin/debootstrap *, \
 	/usr/bin/mmdebstrap *, \
+	/usr/bin/cdebootstrap *, \
 	/usr/bin/sbuild-createchroot *, \
 	/usr/bin/sbuild-update *, \
 	/bin/systemctl reset-failed*, \
@@ -26,6 +27,7 @@ jenkins ALL=  \
 	/bin/rm -rf --one-file-system /srv/workspace/live-build*, \
 	/bin/rm -rf --one-file-system /srv/workspace/mmdebstrap*, \
 	/bin/rm -rf --one-file-system /srv/workspace/debootstrap*, \
+	/bin/rm -rf --one-file-system /srv/workspace/cdebootstrap*, \
 	/bin/rm -rf --one-file-system /var/lib/sbuild/build/*, \
 	/bin/rm -rf --one-file-system /var/lib/schroot/union/*, \
 	/bin/rm -rf --one-file-system /tmp/*, \


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -634,6 +634,11 @@
                     my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap bookworm'
                     my_timed: '40 7 * * *'
                     my_hname: 'osuosl173'
+                - 'cdebootstrap_unstable':
+                    my_description: 'Check cdebootstrap of unstable is reproducible.'
+                    my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap unstable'
+                    my_timed: '50 7 * * *'
+                    my_hname: 'osuosl173'
                 - 'json':
                     my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json for consumption by tracker.debian.org.'
                     my_timed: '1 H/2 * * *'


=====================================
update_jdn.sh
=====================================
@@ -381,7 +381,8 @@ if [ -f /etc/debian_version ] ; then
 		case $HOSTNAME in
 			# needed for rebuilding Debian (using .buildinfo files)
 			osuosl173-amd64) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild" 
-					 DEBS="$DEBS live-build" ;; # needed for live-build
+					 DEBS="$DEBS live-build"	# needed for live-build
+					 DEBS="$DEBS cdebootstrap"  ;;	# needed for testing just that
 			# needed for opensuse openbuildservice
 			osuosl174-amd64) DEBS="$DEBS osc obs-build qemu-kvm libarchive-tools libjson-perl libxml-simple-perl" ;;
 			*) ;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c1bd30417c70e38c818c84b4f89f6fc300dc9190

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c1bd30417c70e38c818c84b4f89f6fc300dc9190
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/20220829/db6f2ae4/attachment-0001.htm>