[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: refactoring and cleanup

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 9a60111c4f13eafab07f8754bbec70e20d5c16c6
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Dec 12 13:54:41 2017 +0000

    reproducible Arch Linux: refactoring and cleanup
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index a5ff7c0..05cdd44 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -297,9 +297,6 @@ remote_build() {
 			cleanup_all
 			exec /srv/jenkins/bin/abort.sh
 		else
-			# FIXME: atm this is never reached…
-			#cleanup_all
-			#handle_remote_error "with exit code $RESULT from $NODE for build #$BUILDNR for ${SRCPACKAGE} from $REPOSITORY"
 			echo "Warning: remote build failed with exit code $RESULT from $NODE for build #$BUILDNR for ${SRCPACKAGE} from $REPOSITORY."
 		fi
 	fi
@@ -352,11 +349,13 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
 	fi
 
 	# preserve results and delete build directory
-	if ! mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.xz $TMPDIR/b$MODE/$SRCPACKAGE/; then
+	if [ -n "$(ls /tmp/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.xz)" ] ; then
+		mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.xz $TMPDIR/b$MODE/$SRCPACKAGE/
+	else
 		echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME didn't build a package!"
-		mkdir -p $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/
-		# copy build$MODE.(log|version) though this is probably useless - FIXME: confirm or disprove
-		cp $TMPDIR/b$MODE/$SRCPACKAGE/build$MODE.* $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/
+		# debug
+		echo "ls $TMPDIR/b$MODE/$SRCPACKAGE/"
+		ls -Rl
 	fi
 
 	rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git