[RelEng] Unify and rename jobs for promoting and publishing builds

Author: HannesWell

JenkinsJobs/Releng/FOLDER.groovy

@@ -95,18 +95,18 @@ pipelineJob('Releng/prepareNextDevCycle'){
 	}
 }
 
-pipelineJob('Releng/renameAndPromote'){
-	displayName('Rename and Promote')
+pipelineJob('Releng/promoteBuild'){
+	displayName('Promote Build')
 	description('''\
 This job does the "stage 1" or first part of a promotion.
-It renames the files for Equinox and Eclipse, creates an appropriate repo on 'downloads', rsync's everything to 'downloads', but leave everything "invisible" -- unless someone knows the exact URL.
+It renames the files for Equinox and Eclipse, creates an appropriate repo on 'downloads', sync's everything to 'downloads', but leave everything "invisible" -- unless someone knows the exact URL.
 This allows two things. First, allows artifacts some time to "mirror" when that is needed.
 But also, allows the sites and repositories to be examined for correctness before making them visible to the world.
 The second (deferred) step that makes things visible works, in part, based on some output of this first step. Hence, they must "share a workspace".
 ''')
 	parameters {
 		stringParam('DROP_ID', null, '''\
-The name (or, build id) of the build to rename and promote. Typically would be a value such as I20160530-2000 or M20160912-1000.
+The name (or, build id) of the build to promote. Typically would be a value such as 'I20250714-1800'.
 It must match the name of the build on the build machine.
 		''')
 		stringParam('CHECKPOINT', null, 'M1, M3, RC1, RC2, RC3 etc (blank for final releases).')
@@ -125,7 +125,7 @@ S is used for milestones and includes the milestone version. For example: S4_25_
 			scm {
 				github('eclipse-platform/eclipse.platform.releng.aggregator', 'master')
 			}
-			scriptPath('JenkinsJobs/Releng/renameAndPromote.jenkinsfile')
+			scriptPath('JenkinsJobs/Releng/promoteBuild.jenkinsfile')
 		}
 	}
 }
@@ -155,11 +155,11 @@ GitHub issue to track tagging the release, for example:
 	}
 }
 
-pipelineJob('Releng/makeVisible'){
-	displayName('Make Visible')
+pipelineJob('Releng/publishPromotedBuild'){
+	displayName('Publish Promoted Build')
 	description('''\
-Make a 'release build', which was previously declared by running the 'Rename And Promote' job, visible.
-The first part of a promotion -- the 'Rename And Promote' job -- puts the build at its final location, but keeps it hidden.
+Make a 'release build', which was previously declared by running the 'Promote Build' job, visible.
+The first part of a promotion -- the 'Promote Build' job -- puts the build at its final location, but keeps it hidden.
 Therefore, both jobs have to share a 'workspace', and the output of the first job must remain in place until its time to "make visible".
 ''')
 	parameters {
@@ -175,7 +175,7 @@ It must match the name of the build on the download server.
 			scm {
 				github('eclipse-platform/eclipse.platform.releng.aggregator', 'master')
 			}
-			scriptPath('JenkinsJobs/Releng/makeVisible.jenkinsfile')
+			scriptPath('JenkinsJobs/Releng/publishPromotedBuild.jenkinsfile')
 		}
 	}
 }

JenkinsJobs/Releng/renameAndPromote.jenkinsfile renamed to JenkinsJobs/Releng/promoteBuild.jenkinsfile

@@ -15,10 +15,10 @@ pipeline {
 					if (!params.releaseBuildID) {
 						error "Required parameter 'releaseBuildID' is not defined."
 					}
-					env.RELEASE_ID = params.releaseBuildID.trim()
-					def releaseIDMatcher = RELEASE_ID =~ /(?<type>[SR])-(?<major>\d+)\.(?<minor>\d+)(.\d+)?((M|RC)\d+[a-z]?)?-\d{12}/
+					env.RELEASE_BUILD_ID = params.releaseBuildID.trim()
+					def releaseIDMatcher = env.RELEASE_BUILD_ID =~ /(?<type>[SR])-(?<major>\d+)\.(?<minor>\d+)(\.\d+)?((M|RC)\d+[a-z]?)?-\d{12}/
 					if (!releaseIDMatcher.matches()) {
-						error "releaseID: ${RELEASE_ID}, does not match the expected pattern."
+						error "releaseID: ${RELEASE_BUILD_ID}, does not match the expected pattern."
 					}
 					env.RELEASE_TYPE = releaseIDMatcher.group('type')
 					env.RELEASE_VERSION_MAJOR = releaseIDMatcher.group('major')
@@ -27,31 +27,31 @@ pipeline {
 				}
 				sh '''
 					echo 'Input parameters read successfully'
-					echo "RELEASE_ID='$RELEASE_ID'"
+					echo "RELEASE_BUILD_ID='$RELEASE_BUILD_ID'"
 					echo "RELEASE_TYPE='$RELEASE_TYPE'"
 					echo "RELEASE_VERSION_MAJOR='$RELEASE_VERSION_MAJOR'"
 					echo "RELEASE_VERSION_MINOR='$RELEASE_VERSION_MINOR'"
 				'''
 			}
 		}
-		stage('Make Download page visible') {
+		stage('Make Download Page visible') {
 			steps {
 				sshagent(['projects-storage.eclipse.org-bot-ssh']) {
 					sh '''#!/bin/bash -xe
 						# Build machine locations (would very seldom change)
 						DOWNLOAD_ROOT=${DOWNLOAD_ROOT:-/home/data/httpd/download.eclipse.org}
 						ARCHIVE_ROOT=${ARCHIVE_ROOT:-/home/data/httpd/archive.eclipse.org} 
-						ECLIPSE_MARKER="eclipse/downloads/drops4/${RELEASE_ID}/buildHidden"
-						EQUINOX_MARKER="equinox/drops/${RELEASE_ID}/buildHidden"
-						SSH_PREFIX="ssh [email protected]"
-						
-						${SSH_PREFIX} rm --force "${DOWNLOAD_ROOT}/${ECLIPSE_MARKER}"
-						${SSH_PREFIX} rm --force "${DOWNLOAD_ROOT}/${EQUINOX_MARKER}"
-						
+						ROOT_LOCATIONS=("${DOWNLOAD_ROOT}")
 						if [[ "${RELEASE_TYPE}" == 'R' ]]; then
-							${SSH_PREFIX} rm --force "${ARCHIVE_ROOT}/${ECLIPSE_MARKER}"
-							${SSH_PREFIX} rm --force "${ARCHIVE_ROOT}/${EQUINOX_MARKER}"
+							ROOT_LOCATIONS+=("${ARCHIVE_ROOT}")
 						fi
+						MARKER_FILES=("eclipse/downloads/drops4/${RELEASE_BUILD_ID}/buildHidden" "equinox/drops/${RELEASE_BUILD_ID}/buildHidden")
+						
+						for rootLocation in "${ROOT_LOCATIONS[@]}"; do
+							for markerFile in "${MARKER_FILES[@]}"; do
+								ssh [email protected] rm --force "${rootLocation}/${markerFile}"
+							done
+						done
 					'''
 				}
 				build job: 'Releng/updateIndex', wait: false
@@ -64,7 +64,7 @@ pipeline {
 			steps {
 				build job: 'Releng/modifyP2CompositeRepository', wait: true, propagate: true, parameters: [
 					string(name: 'repositoryPath', value: "eclipse/updates/${RELEASE_VERSION_MAJOR}.${RELEASE_VERSION_MINOR}"),
-					string(name: 'add', value: "${RELEASE_ID}")
+					string(name: 'add', value: "${RELEASE_BUILD_ID}")
 				]
 			}
 		}

JenkinsJobs/Releng/makeVisible.jenkinsfile renamed to JenkinsJobs/Releng/publishPromotedBuild.jenkinsfile

@@ -21,7 +21,7 @@
      * All milestone releases are 'lightweight', meaning there is no announcement or signoff.
      No additional builds need to be run, just the daily I-build at 6PM EST.
      Thursdays build is promoted to simrel on friday (unless there are problems with Thursdays build, in which case promote Wednesdays) and the compiler is updated if necessary,
-     but the `Promote` and `Make Visible` jobs don't need to be run.
+     but the `Promote Build` and `Publish Promoted Build` jobs don't need to be run.
    - **Wednesday**:
      * Verify that EMF, ECF and Orbit contributions have been included (if applicable).
      * Final release candidate build runs at 6PM EST.
@@ -35,15 +35,15 @@
        * Just [1 line](https://www.eclipse.org/lists/platform-releng-dev/msg38086.html) asking for sign off on the GitHub issue created in the previous step.
    - **Friday**:
      * **Promote** the release candidate (if go).
-       * Run the [Rename and Promote](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/) job in Jenkins
+       * Run the [Promote Build](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/) job in Jenkins
          - DROP_ID: Release candidate build ID (make sure there is no space before or after the ID).
          - CHECKPOINT: M1 etc (blank for final releases)
          - SIGNOFF_BUG: Needs to be updated to sign-off issue (numeric part only)
          - TRAIN_NAME: Whenever the current GA release is planned for (formatted 4 digit year - 2 digit month, i.e `2022-06`)
          - STREAM: 4.24.0 etc
          - DL_TYPE: S is used to promote I-builds.
          - TAG: Parameter should match stream version, i.e `S4_30_0_RC1` etc
-         - After the build  find and open the mail template [artifact](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/lastSuccessfulBuild/artifact/) and have it ready.
+         - After the build  find and open the mail template [artifact](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/lastSuccessfulBuild/artifact/) and have it ready.
          - This should automatically run [tag Eclipse release](https://ci.eclipse.org/releng/job/Releng/job/tagEclipseRelease/) to tag the source code.
        * Contribute to SimRel
          - If you have not already set up SimRel you can do so using Auto Launch [here](https://www.eclipse.org/setups/installer/?url=https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/interim/SimultaneousReleaseTrainConfiguration.setup&show=true)
@@ -54,10 +54,10 @@
            4. Update the Location property to the "Specific repository for building against" in the mailtemplate.txt from promotion.
            5. Commit Simrel updates to Gerrit
               - Message should use year-month format, i.e "Simrel updates for Eclipse and Equinox for 2022-06 M1"
-       * Run the [Make Visible](https://ci.eclipse.org/releng/job/Releng/job/makeVisible/) job in Releng jenkins to make the promoted build visible on the download page.
-         - `releaseBuildID`: the full id of the milestone, release-candidate or release build to make visible, e.g. `S-4.26M1-202209281800` or `R-4.36-202505281830`
+       * Run the [Publish Promoted Build](https://ci.eclipse.org/releng/job/Releng/job/publishPromotedBuild/) job in Releng jenkins to make the promoted build visible on the download page.
+         - `releaseBuildID`: the full id of the milestone, release-candidate or release build to publish, e.g. `S-4.26M1-202209281800` or `R-4.36-202505281830`
        * Send email that the M1 build is available
-         - Use the mail template from the promotion build [artifacts](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/lastSuccessfulBuild/artifact/) in Jenkins to get the download urls.
+         - Use the mail template from the promotion build [artifacts](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/lastSuccessfulBuild/artifact/) in Jenkins to get the download urls.
          - Make sure to mention that the Master branch is now again open for development.
        * For **Milestone builds** return the I-builds to the normal schedule.
      * **After RC1**
@@ -104,7 +104,7 @@ The actual steps to release
 
 **Friday**
   * #### **Promote to GA**
-    - After Simrel declares RC2 (usually the Friday before release) run the [Rename and Promote](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/) job to promote RC2 (or RC2a). If the [daily cleanup for old builds](https://ci.eclipse.org/releng/job/Cleanup/job/dailyCleanOldBuilds/) job was not disabled and the original I-build is no longer available you can use the promoted RC2 build.
+    - After Simrel declares RC2 (usually the Friday before release) run the [Promote Build](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/) job to promote RC2 (or RC2a). If the [daily cleanup for old builds](https://ci.eclipse.org/releng/job/Cleanup/job/dailyCleanOldBuilds/) job was not disabled and the original I-build is no longer available you can use the promoted RC2 build.
       - Change the DL_TYPE from S to R.  
       - TAG will be set to R as well, for example `R4_27` 
     - You can subscribe to [cross-project-issues](https://accounts.eclipse.org/mailing-list/cross-project-issues-dev) to get the notifications on Simrel releases.