[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: djm: no need for IONOS_USERNAME/IONOS_PASSWORD: the ionos library can do...
Mattia Rizzolo (@mattia)
gitlab at salsa.debian.org
Tue Apr 25 10:45:24 BST 2023
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
f7c55c7a by Mattia Rizzolo at 2023-04-25T11:25:02+02:00
djm: no need for IONOS_USERNAME/IONOS_PASSWORD: the ionos library can do oauth2 (and that's how it should be done…
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
1a3aaf3c by Mattia Rizzolo at 2023-04-25T11:25:38+02:00
Revert "reproducible Debian: quick hack to disable updating stretch schroots & pbuilder because stretch is gone from deb.debian.org now"
This reverts commit 8510aacae8f9c5183ea397a4e51c6c37e93949f4.
- - - - -
f0f2dab3 by Mattia Rizzolo at 2023-04-25T11:43:19+02:00
reproducible: completely disable stretch
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
10 changed files:
- bin/djm
- bin/reproducible.ini
- bin/reproducible_build.sh
- bin/reproducible_common.sh
- bin/reproducible_create_meta_pkg_sets.sh
- bin/reproducible_maintenance.sh
- bin/reproducible_scheduler.py
- bin/reproducible_setup_pbuilder.sh
- bin/schroot-create.sh
- job-cfg/reproducible.yaml
Changes:
=====================================
bin/djm
=====================================
@@ -200,10 +200,6 @@ EOF
jenkins) ./bin/powercycle_x86_nodes.py jenkins
;;
ionos*) node=$(echo $NODE | cut -b 6- | cut -d '-' -f1)
- if [ -z "$IONOS_USERNAME" ] || [ -z "$IONOS_PASSWORD" ] ; then
- echo "Environment variables IONOS_USERNAME and IONOS_PASSWORD must be set. Exiting."
- exit 1
- fi
./bin/powercycle_x86_nodes.py $node
;;
virt*-armhf-rb) echo "Sorry, I do not yet know how to handle $NODE, skipping."
=====================================
bin/reproducible.ini
=====================================
@@ -24,7 +24,7 @@ buildinfo = buildinfo
[debian]
distro_root = debian
landing_page = reproducible.html
-suites = unstable bookworm bullseye buster stretch experimental
+suites = unstable bookworm bullseye buster experimental
archs = amd64 arm64 armhf i386
defaultsuite = unstable
defaultarch = amd64
=====================================
bin/reproducible_build.sh
=====================================
@@ -375,7 +375,7 @@ call_diffoscope_on_changes_files() {
# for older suites we only keep diffoscope html output, which saves us >70GB diskspace...
case "$SUITE" in
# add bullseye here once it becomes LTS and also update this comment then
- stretch|buster) DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT}"
+ buster) DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT}"
;;
*) DIFFOSCOPE_OUTPUT="--html $TMPDIR/${DBDREPORT} --text $TMPDIR/$DBDTXT --json $TMPDIR/$DBDJSON"
;;
@@ -750,7 +750,7 @@ EOF
local pbuilder_options=()
case "${SUITE}" in
- stretch|buster|bullseye) ;;
+ buster|bullseye) ;;
*) pbuilder_options+=(--extrapackages usrmerge)
;;
esac
=====================================
bin/reproducible_common.sh
=====================================
@@ -34,7 +34,7 @@ CHPATH=/srv/reproducible-results/chdist
mkdir -p "$CHPATH"
# Debian suites being tested
-SUITES="unstable bookworm bullseye buster stretch experimental"
+SUITES="unstable bookworm bullseye buster experimental"
# Debian architectures being tested
ARCHS="amd64 arm64 armhf i386"
@@ -527,7 +527,7 @@ write_variation_table() {
write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
- write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for stretch/buster/bullseye)</em></td></tr>"
+ write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for buster/bullseye)</em></td></tr>"
write_page "<tr><td>build path</td><td>/build/1st/\$pkg-\$ver <em>(Only varied for unstable/experimental)</em></td><td>/build/2/\$pkg-\$ver/2nd <em>(Only varied for unstable/experimental)</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>"
=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -250,12 +250,8 @@ update_pkg_set_specific() {
cloud-image)
# cloud images of the Debian GNU/Linux operating system designed for OpenStack.
# see https://cloud.debian.org/images/cloud/
- if [ "$SUITE" = "stretch" ] || [ "$SUITE" = "buster" ] ; then
- if [ "$SUITE" = "stretch" ] ; then
- URL="https://cloud.debian.org/images/cloud/OpenStack/current-9/debian-9-openstack-amd64-packages.list"
- elif [ "$SUITE" = "buster" ] ; then
- URL="https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-amd64-packages.list"
- fi
+ if [ "$SUITE" = "buster" ] ; then
+ URL="https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-amd64-packages.list"
echo "Downloading $URL now."
curl $URL | cut -d ' ' -f1 | cut -d ':' -f1 > $TMPFILE
if ! grep '404 Not Found' && ! grep 'DOCTYPE' $TMPFILE ; then
@@ -612,8 +608,8 @@ for SUITE in $SUITES ; do
if [ "$SUITE" = "experimental" ] ; then
# no pkg sets in experimental
continue
- elif [ "$SUITE" = "stretch" ] || [ "$SUITE" = "buster" ] ; then
- # let's not update the stretch or buster pkg sets anymore
+ elif [ "$SUITE" = "buster" ] ; then
+ # let's not update the buster pkg sets anymore
continue
fi
echo "============================================================================="
=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -272,15 +272,10 @@ if [ -n "$http_proxy" ] ; then
pbuilder_http_proxy="--http-proxy $http_proxy"
fi
for s in $SUITES ; do
- # stretch has been removed from deb.debian.org
- # quick hack workaround
- if [ "$s" == "stretch" ] ; then
- continue
- fi
for i in osuosl ionos3 ionos7 ionos9 ionos10 ; do
if [ "${HOSTNAME:0:${#i}}" = "$i" ]; then
# this node is not used to do Debian rebuilds, skip it all
- continue
+ continue 2
fi
done
#
@@ -795,7 +790,7 @@ echo "$(date -u) - Checking for files with bad permissions."
# automatically fix rbuild files with wrong permissions...
# (we know it happens (very rarely) but... shrugs.)
[ ! -d $DEBIAN_BASE/rbuild ] || find $DEBIAN_BASE/rbuild ! -perm 644 -type f -exec chmod -v 644 {} \; 2>/dev/null|| true
-BADPERMS=$(find $DEBIAN_BASE/{buildinfo,dbd,artifacts,stretch,buster,bullseye,bookworm,unstable,experimental,rb-pkg} ! -perm 644 -type f 2>/dev/null|| true)
+BADPERMS=$(find $DEBIAN_BASE/{buildinfo,dbd,artifacts,buster,bullseye,bookworm,unstable,experimental,rb-pkg} ! -perm 644 -type f 2>/dev/null|| true)
if [ -n "$BADPERMS" ] ; then
DIRTY=true
echo
=====================================
bin/reproducible_scheduler.py
=====================================
@@ -775,9 +775,6 @@ def scheduler(arch):
if __name__ == '__main__':
log.info('Updating sources tables for all suites.')
for suite in SUITES:
- if suite in ('stretch', ):
- log.info('Skipping scheduling ' + suite + '.')
- continue
update_sources(suite)
log.info('Sources for suite %s done at %s.', suite, datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
purge_old_pages()
=====================================
bin/reproducible_setup_pbuilder.sh
=====================================
@@ -162,7 +162,7 @@ setup_pbuilder() {
sudo pbuilder --execute $pbuilder_http_proxy --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG}
rm ${TMPFILE}
- # add repo only for experimental and unstable - keep stretch/buster/bullseye "real" (and sid progressive!)
+ # add repo only for experimental and unstable - keep != unstable "real" (and sid progressive!)
if [ "$SUITE" = "unstable" ] || [ "$SUITE" = "experimental" ]; then
# apply further customisations, eg. install $PACKAGES from our repo
create_setup_our_repo_tmpfile ${TMPFILE} "${PACKAGES}"
=====================================
bin/schroot-create.sh
=====================================
@@ -73,7 +73,7 @@ if [ "$SUITE" = "experimental" ] ; then
EXTRA_SOURCES[0]="deb $MIRROR experimental main"
EXTRA_SOURCES[1]="deb-src $MIRROR experimental main"
elif [ "$SUITE" != "unstable" ] && [ "$SUITE" != "sid" ] ; then
- if [ "$SUITE" = "stretch" ] || [ "$SUITE" = "buster" ] ; then
+ if [ "$SUITE" = "buster" ] ; then
EXTRA_SOURCES[6]="deb http://security.debian.org $SUITE/updates main"
EXTRA_SOURCES[7]="deb-src http://security.debian.org $SUITE/updates main"
else
@@ -108,8 +108,8 @@ install_diffoscope() {
fi
# try to use diffoscope from unstable if available/possible
- if [ "$SUITE" != "unstable" ] && [ "$SUITE" != "experimental" ] && [ "$SUITE" != "stretch" ] ; then
- # always try to use diffoscope from unstable on stretch/buster
+ if [ "$SUITE" != "unstable" ] && [ "$SUITE" != "experimental" ] ; then
+ # always try to use diffoscope from unstable on != unstable
echo "deb $MIRROR unstable main" | sudo tee -a "$SCHROOT_TARGET/etc/apt/sources.list" > /dev/null
robust_chroot_apt update
# install diffoscope from unstable without re-adding all recommends...
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -424,9 +424,6 @@
- '{name}_{my_task}_{my_arch}_{my_hname}':
my_task:
- - 'setup_pbuilder_stretch':
- my_description: 'Setup pbuilder for reproducible builds of packages from stretch'
- my_timed: '23 7 1 H/2 *'
- 'setup_pbuilder_buster':
my_description: 'Setup pbuilder for reproducible builds of packages from buster'
my_timed: '23 8 7 * *'
@@ -479,11 +476,6 @@
- '{name}_setup_schroot_{my_distro}_{my_arch}_{my_hname}':
my_distro:
- - 'stretch_diffoscope':
- my_description: 'Setup schroot for running diffoscope in a stretch environment (this is needed to be able to correctly investigate haskell binaries...)'
- my_timed: '23 0 1 * *'
- my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-stretch-diffoscope stretch diffoscope locales-all'
- my_disabled: false
- 'buster_diffoscope':
my_description: 'Setup schroot for running diffoscope in a buster environment (this is needed to be able to correctly investigate haskell binaries...)'
my_timed: '23 0 7 * *'
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/8510aacae8f9c5183ea397a4e51c6c37e93949f4...f0f2dab30369c4a44c7bb7a8fe0129dcb9db011c
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/8510aacae8f9c5183ea397a4e51c6c37e93949f4...f0f2dab30369c4a44c7bb7a8fe0129dcb9db011c
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/20230425/856fd4ca/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list