[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible FreeBSD: Switch master to main and use new repo name

[Mattia Rizzolo (@mattia)]

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


Commits:
b00543b5 by Jessica Clarke at 2021-08-04T01:24:10+01:00
reproducible FreeBSD: Switch master to main and use new repo name

During the SVN-to-Git migration, which resulted in new hashes compared
with the old git-svn repo, the branch name for -CURRENT was changed from
master to main, and the mirror was renamed to freebsd-src on GitHub, to
match the repo on the authoritative (c)git(repo).freebsd.org being
called src.git.

- - - - -


2 changed files:

- bin/reproducible_common.sh
- bin/reproducible_freebsd.sh


Changes:

=====================================
bin/reproducible_common.sh
=====================================
@@ -373,9 +373,9 @@ write_page_intro() {
 	elif [ "$1" = "FreeBSD" ] ; then
 		write_page "        <p><em>Reproducible FreeBSD</em> is an effort to apply this to FreeBSD. Thus FreeBSD is build twice, with a few variations added and then the resulting filesystems from the two builds are put into a compressed tar archive, which is finally compared using <a href=\"https://tracker.debian.org/diffoscope\">diffoscope</a>. Please note that the toolchain is not varied at all as the rebuild happens on exactly the same system. More variations are expected to be seen in the wild.</p>"
 		local PROJECTNAME="freebsd"
-		local PROJECTURL="https://github.com/freebsd/freebsd.git"
+		local PROJECTURL="https://github.com/freebsd/freebsd-src.git"
 		local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD 11.2 system"
-		local BRANCH="master"
+		local BRANCH="main"
 	elif [ "$1" = "alpine" ] ; then
 		local PROJECTNAME="alpine"
 		write_page "        <p><em>Reproducible $PROJECTNAME</em> is an effort to apply this to $PROJECTNAME. Thus $PROJECTNAME packages are build twice, with a few variations added and then the resulting packages from the two builds are compared using <a href=\"https://tracker.debian.org/diffoscope\">diffoscope</a>."


=====================================
bin/reproducible_freebsd.sh
=====================================
@@ -62,8 +62,8 @@ run_diffoscope_on_results() {
 	fi
 	cd $TMPDIR/b1
 	tree .
-	# maybe better remove that "freebsd_master_git?????????.tar.xz" from the tree first?
-	for j in $(find * -type l -prune -o -type f -print |sort -u | egrep -v "freebsd_master_git?????????.tar.xz" ) ; do
+	# maybe better remove that "freebsd_main_git?????????.tar.xz" from the tree first?
+	for j in $(find * -type l -prune -o -type f -print |sort -u | egrep -v "freebsd_main_git?????????.tar.xz" ) ; do
 		ALL_FILES[$FREEBSD_TARGET]=$(( ${ALL_FILES[$FREEBSD_TARGET]}+1 ))
 		call_diffoscope . $j
 		get_filesize $j
@@ -85,9 +85,9 @@ run_diffoscope_on_results() {
 #
 # main
 #
-#FREEBSD_TARGETS="master stable/11 release/11.0"
+#FREEBSD_TARGETS="main stable/11 release/11.0"
 # temporarily just build one branch…
-FREEBSD_TARGETS="master"
+FREEBSD_TARGETS="main"
 # arrays to save results
 declare -A ALL_FILES
 declare -A GOOD_FILES
@@ -116,7 +116,7 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do
 	echo "============================================================================="
 	echo "$(date -u) - Cloning FreeBSD git repository."
 	echo "============================================================================="
-	$RSSH git clone --depth 1 --branch $FREEBSD_TARGET https://github.com/freebsd/freebsd.git $TMPBUILDDIR
+	$RSSH git clone --depth 1 --branch $FREEBSD_TARGET https://github.com/freebsd/freebsd-src.git $TMPBUILDDIR
 	FREEBSD[$FREEBSD_TARGET]=$($RSSH "cd $TMPBUILDDIR ; git log -1")
 	FREEBSD_VERSION[$FREEBSD_TARGET]=$($RSSH "cd $TMPBUILDDIR ; git describe --always")
 	echo "This is FreeBSD branch $FREEBSD_TARGET at ${FREEBSD_VERSION[$FREEBSD_TARGET]}."
@@ -239,7 +239,7 @@ publish_page
 # the end
 calculate_build_duration
 print_out_duration
-FREEBSD_TARGET="master"
+FREEBSD_TARGET="main"
 irc_message reproducible-changes "$REPRODUCIBLE_URL/freebsd/ has been updated. (${GOOD_PERCENT[$FREEBSD_TARGET]}% reproducible)"
 echo "============================================================================="
 



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b00543b59cf559a5c07f1610ebc3bb57baee1629
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/20210804/34b61daa/attachment-0001.htm>