[Git][qa/jenkins.debian.net][master] rdn: deal correctly with binNMU versions with an epoch too
Holger Levsen (@holger)
gitlab at salsa.debian.org
Sun May 11 09:05:57 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
2a3d2fd6 by Holger Levsen at 2025-05-11T10:05:42+02:00
rdn: deal correctly with binNMU versions with an epoch too
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
11 changed files:
- hosts/codethink01-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/codethink02-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/codethink05-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/common-ppc64el/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/common-riscv64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/infom07-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/infom08-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/ionos17-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/osuosl4-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/osuosl5-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/osuosl5-amd64/var/www/html/index.html
Changes:
=====================================
hosts/codethink01-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/codethink02-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/codethink05-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/common-ppc64el/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/common-riscv64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/infom07-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/infom08-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/ionos17-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/osuosl4-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/osuosl5-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,12 +17,16 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
-SOURCE=$(basename "$1" | cut -d_ -f1)
-# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
-VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
+SOURCE=$(basename "$1" | cut -d '_' -f1)
+# take VERSION from .buildinfo file (which has the epoch) but drop +bX suffix from binNMUs
+VERSION=$(grep ^Version: "$1" | cut -d ' ' -f2- | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Downloading sources $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
=====================================
hosts/osuosl5-amd64/var/www/html/index.html
=====================================
@@ -138,7 +138,7 @@
<li><em>debootsnap</em> uses <a href="https://snapshot.debian.org">snapshot.debian.org</a> to retrieve the exact same version of each build dependency package.</li>
<li>The goal is to replicate the same build process that is used by Debian during package publication -- not to seek out additional sources of variance.</li>
<li>Variance testing, used to find factors that can prevent packages from rebuilding reproducibly, will continue at <a href="https://tests.reproducible-builds.org/debian/reproducible.html">https://tests.reproducible-builds.org/debian/reproducible.html</a>.</li>
- <li>And if you are wondering why we are doing this at all, then hopefully the <a href="https://reproducible-builds.org">Reproducible Builds website</a> will explain why this is useful.</li>
+ <li>If you are wondering why we are doing this at all, then hopefully the <a href="https://reproducible-builds.org">Reproducible Builds website</a> will explain why this is useful.</li>
</ul>
<table>
<tr>
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2a3d2fd6521e30acf411634a381706fe01988fce
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2a3d2fd6521e30acf411634a381706fe01988fce
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/20250511/b2bafbcb/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list