[Git][qa/jenkins.debian.net][master] rdn: deal correctly with binNMU versions
Holger Levsen (@holger)
gitlab at salsa.debian.org
Sat May 10 08:39:04 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
d0a635d6 by Holger Levsen at 2025-05-10T09:38:47+02:00
rdn: deal correctly with binNMU versions
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
10 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
Changes:
=====================================
hosts/codethink01-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/codethink02-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/codethink05-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/common-ppc64el/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/common-riscv64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/infom07-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/infom08-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/ionos17-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/osuosl4-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
=====================================
hosts/osuosl5-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -18,7 +18,8 @@ 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)
-VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+# 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')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
+set +x
+echo
+echo "+------------------------------------------------------------------------------+"
+echo "| Finished running debrebuild $(date -u -R) |"
+echo "+------------------------------------------------------------------------------+"
+
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/d0a635d61653147dcb8f1ea87dc4e0638c4c937f
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/d0a635d61653147dcb8f1ea87dc4e0638c4c937f
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/20250510/13268b56/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list