[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: reproducible debian: _html_repository_comparison update repository url

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
fdebcc48 by Mattia Rizzolo at 2018-05-18T18:08:42+02:00
reproducible debian: _html_repository_comparison update repository url

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
58263c17 by Mattia Rizzolo at 2018-05-18T18:21:58+02:00
update_jdn: don't make noise if the sudo config is fine

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
8647d21a by Mattia Rizzolo at 2018-05-18T18:22:21+02:00
update_jdn: simpler checks for up2date jenkins confs

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
96720145 by Mattia Rizzolo at 2018-05-18T18:22:42+02:00
update_jdn: don't bother telling if config files are unchanged

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/reproducible_html_repository_comparison.sh
- update_jdn.sh


Changes:

=====================================
bin/reproducible_html_repository_comparison.sh
=====================================
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -38,13 +38,13 @@ ARCH="amd64"
 SUITE="unstable"
 echo "$(date -u) - starting to write $PAGE page. Downloading Sources and Packages files from our repository."
 write_page_header $VIEW "Comparison between the reproducible builds apt repository and regular Debian suites"
-write_page "<p>These source packages (and their binaries packages) are different from unstable in our apt repository on alioth. They are available for <a href=\"https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain#Usage_example\">testing using these sources.lists</a> entries:<pre>"
-write_page "deb http://reproducible.alioth.debian.org/debian/ ./"
-write_page "deb-src http://reproducible.alioth.debian.org/debian/ ./"
+write_page "<p>These source packages (and their binaries packages) are different from unstable in our experimental apt repository. They are available for <a href=\"https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain#Usage_example\">testing using these sources.lists</a> entries:<pre>"
+write_page "deb https://tests.reproducible-builds.org/debian/repository/debian/ ./"
+write_page "deb-src https://tests.reproducible-builds.org/debian/repository/debian/ ./"
 write_page "</pre></p>"
 
-custom_curl http://reproducible.alioth.debian.org/debian/Sources $SOURCES
-custom_curl http://reproducible.alioth.debian.org/debian/Packages $PACKAGES
+custom_curl https://tests.reproducible-builds.org/debian/repository/debian/Sources $SOURCES
+custom_curl https://tests.reproducible-builds.org/debian/repository/debian/Packages $PACKAGES
 SOURCEPKGS=$(grep-dctrl -n -s Package -r -FPackage . $SOURCES | sort -u)
 echo
 


=====================================
update_jdn.sh
=====================================
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -539,7 +539,7 @@ for h in common common-amd64 common-i386 common-arm64 common-armhf "$HOSTNAME" ;
 	esac
 	if [ -d "hosts/$h/etc/sudoers.d/" ]; then
 		for f in "hosts/$h/etc/sudoers.d/"* ; do
-			/usr/sbin/visudo -c -f "$f"
+			/usr/sbin/visudo -c -f "$f" > /dev/null
 		done
 	fi
 	for d in etc usr ; do
@@ -675,26 +675,18 @@ if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
 	#
 	cd /srv/jenkins/job-cfg
 	for metaconfig in *.yaml.py ; do
-	# there are both python2 and python3 scripts here
-		[ -e ./$metaconfig ] || continue
-		./$metaconfig > $TMPFILE
-		if ! sudo -u jenkins-adm cmp -s ${metaconfig%.py} - < $TMPFILE ; then
-			sudo -u jenkins-adm tee ${metaconfig%.py} > /dev/null < $TMPFILE
+		# regen the file only if the .py is newer than the generated file
+		if [ ! -f "${metaconfig%.py}" ] && [ "$metaconfig" -nt "${metaconfig%.py}" ]; then
+			sudo -u jenkins-adm "./$metaconfig" > "$TMPFILE"
+			sudo -u jenkins-adm mv "$TMPFILE" "${metaconfig%.py}"
 		fi
 	done
 	rm -f $TMPFILE
 	for config in *.yaml ; do
-		# do update, if
-		# no stamp file exist or
-		# no .py file exists and config is newer than stamp or
-		# a .py file exists and .py file is newer than stamp
-		if [ ! -f $STAMP ] || \
-		 ( [ ! -f $config.py ] && [ $config -nt $STAMP ] ) || \
-		 ( [ -f $config.py ] && [ $config.py -nt $STAMP ] ) ; then
+		# do update, if no stamp file exist or config is newer than stamp
+		if [ ! -f $STAMP ] || [ $config -nt $STAMP ] ; then
 			echo "$config has changed, executing updates."
 			$JJB update $config
-		else
-			echo "$config has not changed, nothing to do."
 		fi
 	done
 	explain "jenkins jobs updated."



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/d4b9072432e22988d5b174bf0358a9feeac3cebf...96720145d15157d56009f15d27be42f41bfb116a

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/d4b9072432e22988d5b174bf0358a9feeac3cebf...96720145d15157d56009f15d27be42f41bfb116a
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/20180518/6e652b81/attachment-0001.html>