[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible_debian_live_build: Don't attempt to preserve the timestamp

[Holger Levsen (@holger)]

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


Commits:
8dcc081a by Roland Clobus at 2022-06-07T14:26:49+02:00
reproducible_debian_live_build: Don't attempt to preserve the timestamp

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

- - - - -
e6194ffb by Roland Clobus at 2022-06-07T14:26:53+02:00
reproducible_debian_live_build: Forces delete from workspace.

Some files in the workspace were created with sudo.

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

- - - - -


3 changed files:

- bin/jenkins_node_wrapper.sh
- bin/reproducible_debian_live_sync_result.sh
- bin/reproducible_maintenance.sh


Changes:

=====================================
bin/jenkins_node_wrapper.sh
=====================================
@@ -60,11 +60,11 @@ shift
 
 if [[ "$*" = "/bin/true" ]] ; then
 	exec /bin/true ; croak "Exec failed";
-elif [ "$1" = scp ] && [ "$2" = -p ] && [ "$3" = -f ]; then
+elif [ "$1" = scp ] && [ "$2" = -f ]; then
 	set -x
 	echo "Debug: $*"
 	echo "Debug: $@"
-	exec scp -p -f "$4"; croak "Exec failed";
+	exec scp -f "$3"; croak "Exec failed";
 elif [[ "$*" = 'rm -v $(mktemp --tmpdir=/tmp read-only-fs-test-XXXXXX)' ]] ; then
 	exec rm -v $(mktemp --tmpdir=/tmp read-only-fs-test-XXXXXX) ; croak "Exec failed";
 elif [[ "$*" = "cleanup_nodes /srv/jenkins/bin/reproducible_slay.sh" ]] ; then


=====================================
bin/reproducible_debian_live_sync_result.sh
=====================================
@@ -25,8 +25,7 @@ rsync_remote_results() {
     echo "$(date -u) - Starting to sync $description to '$filename'."
     # Copy the new results from the build node to the web server node
     cd "$BASE"/"$PROJECT"
-    # Preserve timestamp
-    scp -p -o Batchmode=yes "$NODE":"$origfile" "$filename.tmp"
+    scp -o Batchmode=yes "$NODE":"$origfile" "$filename.tmp"
     chmod 755 "$filename.tmp"
     mv "$filename.tmp" "$filename"
     echo "$(date -u) - enjoy ${REPRODUCIBLE_URL}/${PROJECT}/${filename}"


=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -136,7 +136,7 @@ OLDSTUFF=$(find /srv/workspace/live-build -maxdepth 1 -type d -mtime +2 -name "*
 if [ ! -z "$OLDSTUFF" ] ; then
 	echo
 	echo "Old temp directories found in /srv/workspace/live-build"
-	find /srv/workspace/live-build -maxdepth 1 -type d -mtime +2 -name "*.*" -exec rm -rv --one-file-system {} \; || true
+	find /srv/workspace/live-build -maxdepth 1 -type d -mtime +2 -name "*.*" -exec rm -rfv --one-file-system {} \; || true
 	echo "These old directories have been deleted."
 	echo
 	DIRTY=true



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/d39d85d8103324fd5627fedb1b4875daab2971d1...e6194ffb19d72c1351db8cc006924b84d4a01dd1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/d39d85d8103324fd5627fedb1b4875daab2971d1...e6194ffb19d72c1351db8cc006924b84d4a01dd1
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/20220607/5081f419/attachment-0001.htm>