Merge pull request #540 from jenkinsci/helpdesk-4774

feat(publish/all) stop using remote server for packaging

Author: dduportal

deb/publish/publish.sh

@@ -12,9 +12,6 @@ set -euxo pipefail
 # $$ Contains current pid
 D="$AGENT_WORKDIR/$$"
 
-# Convert string to array to correctly escape cli parameter
-SSH_OPTS=($SSH_OPTS)
-
 bin="$(dirname "$0")"
 
 function clean() {
@@ -62,31 +59,15 @@ function generateSite() {
 }
 
 function init() {
-	mkdir -p "$D/binary" "$D/contents" "$D/html"
-
-	# where to put binary files
-	mkdir -p "$DEBDIR" # where to put binary files
-
-	# where to put repository index and other web contents
-	mkdir -p "$DEB_WEBDIR"
-}
-
-function skipIfAlreadyPublished() {
-	if [[ -f "${DEBDIR}/$(basename "$DEB")" ]]; then
-		echo "File already published, nothing else todo"
-		return 0
-	fi
-	return 1
+	mkdir -p "$D/binary" "$D/contents" "$D/html" \
+		"$DEBDIR" `# where to put binary files` \
+		"$DEB_WEBDIR" `# where to put repository index and other web contents`
 }
 
 # Upload Debian Package
 function uploadPackage() {
-	rsync \
+	rsync --archive \
 		--verbose \
-		--recursive \
-		--compress \
-		--times \
-		--ignore-existing \
 		--progress \
 		"$DEB" "$DEBDIR/"
 }
@@ -99,56 +80,28 @@ function uploadPackageSite() {
 		"$D"/binary/Contents* \
 		"$D"/contents/binary
 
-	rsync \
+	rsync --archive \
 		--verbose \
-		--recursive \
-		--compress \
-		--times \
 		--progress \
 		"$D/contents/" "$DEB_WEBDIR/"
-
-	rsync \
-		--archive \
-		--compress \
-		--times \
-		--progress \
-		--verbose \
-		-e "ssh ${SSH_OPTS[*]}" \
-		"$D/contents/" "$PKGSERVER:${DEB_WEBDIR// /\\ }/"
 }
 
 function uploadHtmlSite() {
 	# Html file need to be located in the binary directory
-	rsync \
+	rsync --archive \
+		--verbose \
+		--progress \
 		--include "HEADER.html" \
 		--include "FOOTER.html" \
 		--exclude "*" \
-		--compress \
-		--times \
-		--recursive \
-		--progress \
-		--verbose \
 		"$D/html/" "$DEBDIR/"
-
-	rsync \
-		--archive \
-		--compress \
-		--times \
-		--include "index.html" \
-		--exclude "*" \
-		--progress \
-		--verbose \
-		-e "ssh ${SSH_OPTS[*]}" \
-		"$D/html/" "$PKGSERVER:${DEB_WEBDIR// /\\ }/"
 }
 
 function show() {
 	echo "Parameters:"
 	echo "DEB: $DEB"
 	echo "DEBDIR: $DEBDIR"
 	echo "DEB_WEBDIR: $DEB_WEBDIR"
-	echo "SSH_OPTS: ${SSH_OPTS[*]}"
-	echo "PKGSERVER: $PKGSERVER"
 	echo "GPG_KEYNAME: $GPG_KEYNAME"
 	echo "---"
 }
@@ -171,17 +124,12 @@ function signSite() {
 }
 
 show
-## Disabling this function allow us to recreate and sign the repository.
-# the debian package won't be overrided as we use the parameter '--ignore-existing'
-#skipIfAlreadyPublished
 init
 generateSite
 signSite
 
-if ! skipIfAlreadyPublished; then
-	uploadPackage
-	uploadPackageSite
-fi
+uploadPackage
+uploadPackageSite
 
 uploadHtmlSite
 clean

env/azure.mk

@@ -1,17 +1,6 @@
 #
 # Environment definition for dry-run of the packaging process
-# 
-
-# JENKINS used to generate MSI packages
-export JENKINS_URL=https://cloudbees.ci.cloudbees.com/
-
-# the host to publish bits to
-export PKGSERVER=jenkins@remote
-# Testing both with and without SSH_OPTS
-#export SSH_OPTS=-p 22
-#export SCP_OPTS=-P 22
-export SSH_OPTS=-p 22
-export SCP_OPTS=-P 22
+#
 
 # where to put binary files
 export TESTDIR=$(realpath .)/pkg.jenkins.io
@@ -23,10 +12,9 @@ export RPMDIR=${TESTDIR}/rpm${RELEASELINE}
 # where to put repository index and other web contents
 export  RPM_WEBDIR=${TESTDIR}/rpm${RELEASELINE}
 export  DEB_WEBDIR=${TESTDIR}/debian${RELEASELINE}
-export  WAR_WEBDIR=${TESTDIR}/war${RELEASELINE}
 export  MSI_WEBDIR=${TESTDIR}/windows${RELEASELINE}
 
 # URL to the aforementioned webdir.
-WEBSERVER=pkg.jenkins.io
-export  RPM_URL=https://${WEBSERVER}/rpm${RELEASELINE}
-export  DEB_URL=https://${WEBSERVER}/debian${RELEASELINE}
+WEBSERVER=https://pkg.jenkins.io
+export  RPM_URL=${WEBSERVER}/rpm${RELEASELINE}
+export  DEB_URL=${WEBSERVER}/debian${RELEASELINE}

env/release.mk

@@ -21,45 +21,15 @@ function generateSite() {
 }
 
 function init() {
-	mkdir -p "$D"
-
-	mkdir -p "${MSIDIR}/${VERSION}/"
-}
-
-function skipIfAlreadyPublished() {
-	if [[ -f "${MSIDIR}/${VERSION}/$(basename "$MSI")" ]]; then
-		echo "File already published, nothing else todo"
-		exit 0
-
-	fi
+	mkdir -p "$D" "${MSIDIR}/${VERSION}"
 }
 
 function uploadPackage() {
 	cp "${ARTIFACTNAME}-${VERSION}${RELEASELINE}.msi" "${MSI}"
 
 	sha256sum "${MSI}" >"${MSI_SHASUM}"
-
 	cat "${MSI_SHASUM}"
 
-	# Local
-	rsync \
-		--compress \
-		--times \
-		--verbose \
-		--recursive \
-		--ignore-existing \
-		--progress \
-		"${MSI}" "${MSIDIR}/${VERSION}/"
-
-	rsync \
-		--compress \
-		--times \
-		--ignore-existing \
-		--recursive \
-		--progress \
-		--verbose \
-		"${MSI_SHASUM}" "${MSIDIR}/${VERSION}/"
-
 	# Update the symlink to point to most recent Windows build
 	#
 	# Remove anything in current directory named 'latest'
@@ -72,25 +42,17 @@ function uploadPackage() {
 	# and assumes it points to the most recent MSI file.
 	ln -s "${VERSION}/$(basename "$MSI")" latest
 
-	# Overwrites the existing symlink on the destination
-	rsync \
-		--times \
-		--archive \
-		--links \
+	# Local
+	rsync --archive \
 		--verbose \
-		latest "${MSIDIR}/"
-
-	# Remove the local symlink
-	rm latest
+		--progress \
+		"${MSI}" "${MSI_SHASUM}" latest "${MSIDIR}/${VERSION}/"
 }
 
 # The site need to be located in the binary directory
 function uploadSite() {
-	rsync \
-		--compress \
-		--times \
+	rsync --archive \
 		--verbose \
-		--recursive \
 		--progress \
 		"${D}/" "${MSIDIR// /\\ }/"
 }
@@ -103,7 +65,6 @@ function show() {
 }
 
 show
-skipIfAlreadyPublished
 init
 generateSite
 uploadPackage