[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: always use short hostname (after fixing FQDN everywhere manually)

[Holger Levsen]

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


Commits:
91a936f8 by Holger Levsen at 2018-11-29T17:05:02Z
reproducible: always use short hostname (after fixing FQDN everywhere manually)

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

- - - - -


3 changed files:

- bin/reproducible_build.sh
- bin/reproducible_build_archlinux_pkg.sh
- bin/reproducible_build_rpm.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -460,7 +460,7 @@ choose_package() {
 	fi
 	create_results_dirs
 	echo "============================================================================="
-	echo "Initialising reproducibly build of ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname -f) now. $ANNOUNCE"
+	echo "Initialising reproducibly build of ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname) now. $ANNOUNCE"
 	echo "1st build will be done on $NODE1."
 	echo "2nd build will be done on $NODE2."
 	echo "============================================================================="
@@ -478,7 +478,7 @@ choose_package() {
 	elif [ "$NOTIFY" = "0" ] ; then  # the build script has a different idea of notify than the scheduler,
 		NOTIFY=''                  # the scheduler uses integers, build.sh uses strings.
 	fi
-	log_info "starting to build ${SRCPACKAGE}/${SUITE}/${ARCH} on $(hostname -f) on '$DATE'"
+	log_info "starting to build ${SRCPACKAGE}/${SUITE}/${ARCH} on $(hostname) on '$DATE'"
 	log_info "The jenkins build log is/was available at ${BUILD_URL}console.log"
 }
 
@@ -562,7 +562,7 @@ check_suitability() {
 
 first_build() {
 	echo "============================================================================="
-	echo "Building ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname -f) now."
+	echo "Building ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname) now."
 	echo "Date:     $(date)"
 	echo "Date UTC: $(date -u)"
 	echo "============================================================================="
@@ -612,7 +612,7 @@ EOF
 
 second_build() {
 	echo "============================================================================="
-	echo "Re-Building ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname -f) now."
+	echo "Re-Building ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname) now."
 	echo "Date:     $(date)"
 	echo "Date UTC: $(date -u)"
 	echo "============================================================================="


=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -113,7 +113,7 @@ choose_package() {
 
 first_build() {
 	echo "============================================================================="
-	echo "Building for Arch Linux on $(hostname -f) now."
+	echo "Building for Arch Linux on $(hostname) now."
 	echo "Source package: ${SRCPACKAGE}"
 	echo "Repository:     $REPOSITORY"
 	echo "Date:           $(date -u)"
@@ -124,7 +124,7 @@ first_build() {
 	local FUTURE_STATE="disabled"
 	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"
 	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"
-	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then
+	if [ "$(hostname)" = "profitbricks-build4-amd64" ] ; then
 		FUTURE_STATE="enabled"
 		MAKEPKG_ENV_VARS="$MAKEPKG_ENV_VARS GIT_SSL_NO_VERIFY=1"
 		MAKEPKG_OPTIONS="$MAKEPKG_OPTIONS --skippgpcheck"
@@ -197,7 +197,7 @@ first_build() {
 
 second_build() {
 	echo "============================================================================="
-	echo "Re-Building for Arch Linux on $(hostname -f) now."
+	echo "Re-Building for Arch Linux on $(hostname) now."
 	echo "Source package: ${SRCPACKAGE}"
 	echo "Repository:     $REPOSITORY"
 	echo "Date:           $(date -u)"
@@ -209,7 +209,7 @@ second_build() {
 	local FUTURE_STATE="disabled"
 	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"
 	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"
-	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then
+	if [ "$(hostname)" = "profitbricks-build4-amd64" ] ; then
 		FUTURE_STATE="enabled"
 		MAKEPKG_ENV_VARS="$MAKEPKG_ENV_VARS GIT_SSL_NO_VERIFY=1"
 		MAKEPKG_OPTIONS="$MAKEPKG_OPTIONS --skippgpcheck"


=====================================
bin/reproducible_build_rpm.sh
=====================================
@@ -92,7 +92,7 @@ choose_package() {
 
 first_build() {
 	echo "============================================================================="
-	echo "Building for $RELEASE ($ARCH) on $(hostname -f) now."
+	echo "Building for $RELEASE ($ARCH) on $(hostname) now."
 	echo "Source package: ${SRCPACKAGE}"
 	echo "Date:           $(date -u)"
 	echo "============================================================================="
@@ -113,7 +113,7 @@ first_build() {
 
 second_build() {
 	echo "============================================================================="
-	echo "Re-Building for $RELEASE ($ARCH) on $(hostname -f) now."
+	echo "Re-Building for $RELEASE ($ARCH) on $(hostname) now."
 	echo "Source package: ${SRCPACKAGE}"
 	echo "Date:           $(date -u)"
 	echo "============================================================================="



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/91a936f8af850a7155baff84b9f67b3fd85c7b29
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/20181129/5733aae6/attachment-0001.html>