[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible alpine: fix alpine version generation

[Holger Levsen]

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


Commits:
e31161a5 by kpcyrd at 2019-06-07T19:04:03Z
reproducible alpine: fix alpine version generation

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

- - - - -


2 changed files:

- bin/reproducible_alpine_scheduler.sh
- bin/reproducible_build_alpine_pkg.sh


Changes:

=====================================
bin/reproducible_alpine_scheduler.sh
=====================================
@@ -40,7 +40,7 @@ update_alpine_repositories() {
 	> "$ALPINE_PKGS"_full_pkgbase_list
 	for REPO in $ALPINE_REPOS ; do
 		schroot --run-session -c $SESSION --directory /var/lib/jenkins/aports/$REPO -- ap dump-json | \
-			jq -r 'to_entries|.[]|"\(.key) \(.value.pkgver)-\(.value.pkgrel)"' | \
+			jq -r 'to_entries|.[]|"\(.key) \(.value.pkgver)-r\(.value.pkgrel)"' | \
 			while read pkgname version; do
 				printf '%s %s %s\n' "$REPO" "$pkgname" "$version"
 			done | sort -u -R >> "$ALPINE_PKGS"_full_pkgbase_list


=====================================
bin/reproducible_build_alpine_pkg.sh
=====================================
@@ -148,7 +148,7 @@ first_build() {
 	if [ -n "$epoch" ] ; then
 		epoch="$epoch:"
 	fi
-	VERSION="$epoch$pkgver-$pkgrel"
+	VERSION="$epoch$pkgver-r$pkgrel"
 	echo $VERSION > $TMPDIR/b1/$SRCPACKAGE/build1.version
 	# nicely run abuild with a timeout of $TIMEOUT hours
 	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
@@ -220,7 +220,7 @@ second_build() {
 	if [ -n "$epoch" ] ; then
 		epoch="$epoch:"
 	fi
-	VERSION="$epoch$pkgver-$pkgrel"
+	VERSION="$epoch$pkgver-r$pkgrel"
 	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version
 	# nicely run abuild with a timeout of $TIMEOUT hours
 	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/e31161a5c76f40c21e3769865fa78e3d6aed0258
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/20190607/f55479fd/attachment-0001.html>