[RelEng] Simplify creation of release P2 repo and restore its mirrorsURL

Since 4.28 respectively 2023-06 the property 'p2.mirrorsURL' is not
added to release repositories anymore, which effectively disables the
use of mirrors.
This happened accidentally because the JDKs installed at the Jenkins
agents running the release process became insufficient then.

In order to simplify the release process, the P2-repositories produced
by I-builds alredy have their final name set.

Fixes #3201

Author: HannesWell

JenkinsJobs/Releng/promoteBuild.jenkinsfile

@@ -60,6 +60,8 @@ pipeline {
 					assignEnvVariable('BUILD_SERVICE', versionMatcher.group('service'))
 					versionMatcher = null // release matcher as it's not serializable
 
+					assignEnvVariable('BUILD_REPO_ORIGINAL', "${BUILD_MAJOR}.${BUILD_MINOR}-${REPO_BUILD_TYPE}-builds")
+					
 					if ("${CHECKPOINT}" ==~ /M\d+([a-z])?/ || "${CHECKPOINT}" ==~ /RC\d+([a-z])?/) { // milestone or RC promotion
 						assignEnvVariable('DL_TYPE', 'S')
 						// REPO_SITE_SEGMENT variale not used in this case
@@ -97,8 +99,6 @@ pipeline {
 			environment {
 				BUILDMACHINE_BASE_DL = "${EP_ECLIPSE_ROOT}/downloads/drops4"
 				BUILDMACHINE_BASE_EQ = "${EP_EQUINOX_ROOT}/drops"
-				BUILD_REPO_ORIGINAL = "${BUILD_MAJOR}.${BUILD_MINOR}-${REPO_BUILD_TYPE}-builds"
-				BUILDMACHINE_BASE_SITE = "${EP_ECLIPSE_ROOT}/updates/${BUILD_REPO_ORIGINAL}"
 				// Eclipse and Equinox drop Site (final segment)
 				ECLIPSE_DL_DROP_DIR_SEGMENT = "${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP}"
 				EQUINOX_DL_DROP_DIR_SEGMENT = "${DL_TYPE}-${DL_LABEL_EQ}-${BUILD_TIMESTAMP}"
@@ -138,6 +138,36 @@ pipeline {
 				]
 			}
 		}
+		stage('Promote P2 Repository') {
+			when {
+				environment name: 'DL_TYPE', value: 'R'
+			}
+			steps {
+				dir("${WORKSPACE}/updates") {
+					sshagent(['projects-storage.eclipse.org-bot-ssh']) {
+						sh '''#!/bin/bash -xe
+							MIRROR_URL="https://www.eclipse.org/downloads/download.php?format=xml&file=/eclipse/updates/${REPO_SITE_SEGMENT}/${DL_DROP_ID}"
+							sourceRepository="${EP_ECLIPSE_ROOT}/updates/${BUILD_REPO_ORIGINAL}/${REPO_ID}"
+							targetRepository="${EP_ECLIPSE_ROOT}/updates/${REPO_SITE_SEGMENT}/${DL_DROP_ID}"
+							ssh [email protected] "cp -r '${sourceRepository}' '${targetRepository}'"
+							
+							JAR_FILE='artifacts.jar'
+							XML_FILE='artifacts.xml'
+							scp -r [email protected]:${targetRepository}/${JAR_FILE} .
+							
+							jar --extract "--file=${JAR_FILE}"
+							sed -i --expression "s|<p2_mirrorsURL_PLACEHOLDER></p2_mirrorsURL_PLACEHOLDER>|${MIRROR_URL}|g" "${XML_FILE}"
+							
+							jar --create --no-manifest --file=${JAR_FILE} "${XML_FILE}"
+							xz --extreme --force --keep "${XML_FILE}"
+							
+							scp "${JAR_FILE}" [email protected]:${targetRepository}
+							scp "${XML_FILE}.xz" [email protected]:${targetRepository}
+						'''
+					}
+				}
+			}
+		}
 	}
 	post {
 		always {

cje-production/promotion/promoteSites.sh

@@ -188,65 +188,13 @@ function renameBuild ()
   done
 }
 
-function createBaseBuilder ()
-{
-  epRelDir=$(ssh [email protected] ls -d --format=single-column ${BUILDMACHINE_BASE_DL}/R-*|sort|tail -1)
-  BASEBUILDER_DIR=${WORKSPACE}/basebuilder
-  export BASEBUILDER_DIR
-  mkdir -p ${BASEBUILDER_DIR}
-  mkdir -p ${WORKSPACE}/tempEclipse
-  pushd ${WORKSPACE}/tempEclipse
-    scp [email protected]:${epRelDir}/eclipse-platform-*-linux-gtk-x86_64.tar.gz eclipse-platform.tar.gz
-    tar xvzf eclipse-platform.tar.gz
-    ${WORKSPACE}/tempEclipse/eclipse/eclipse -nosplash \
-        -debug -consolelog -data ${WORKSPACE}/workspace-toolsinstall \
-        -application org.eclipse.equinox.p2.director \
-        -repository "https://download.eclipse.org/eclipse/updates/latest/","https://download.eclipse.org/eclipse/updates/buildtools/",${WEBTOOLS_REPO} \
-        -installIU org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group \
-        -destination ${BASEBUILDER_DIR} \
-        -profile SDKProfile
-  popd
-  export ECLIPSE_EXE=${BASEBUILDER_DIR}/eclipse
-  rm -rf ${WORKSPACE}/tempEclipse
-}
-
-function addRepoProperties ()
-{
-  APP_NAME=org.eclipse.wtp.releng.tools.addRepoProperties 
-  devworkspace=${devworkspace:-${WORKSPACE}/workspaceAddRepoProperties}
-
-  REPO=$1
-  REPO_TYPE=$2
-  BUILD_ID=$3
-
-  createBaseBuilder
-  MIRRORURL=/eclipse/updates/${REPO_TYPE}/${BUILD_ID} 
-  MIRRORURL_ARG="https://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}"
-
-  ART_REPO_NAME="Eclipse Project Repository for ${TRAIN_NAME}"
-  CON_REPO_NAME="Eclipse Project Repository for ${TRAIN_NAME}"
-
-  MIRRORS_URL_ARG=-Dp2MirrorsURL=${MIRRORURL_ARG}
-  ART_REPO_ARG=-DartifactRepoDirectory=${REPO}
-  CON_REPO_ARG=-DmetadataRepoDirectory=${REPO}
-  ART_REPO_NAME_ARG=-Dp2ArtifactRepositoryName=\"${ART_REPO_NAME}\"
-  CON_REPO_NAME_ARG=-Dp2MetadataRepositoryName=\"${CON_REPO_NAME}\"
-
-  ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vmargs ${MIRRORS_URL_ARG} -Dp2ArtifactRepositoryName="${ART_REPO_NAME}" -Dp2MetadataRepositoryName="${CON_REPO_NAME}" ${ART_REPO_ARG} ${CON_REPO_ARG}
-}
-
-# Extract WEBTOOLS_REPO and other variables from buildproperties.shsource for the build
-source ${WORKSPACE}/buildproperties.shsource
-
 # Main promotion scripts starts here
 
 #Take backup of current build
 LOCAL_EP_DIR=${WORKSPACE}/eclipse
 LOCAL_EQ_DIR=${WORKSPACE}/equinox
-LOCAL_REPO=${WORKSPACE}/updates
 mkdir -p ${LOCAL_EP_DIR}
 mkdir -p ${LOCAL_EQ_DIR}
-mkdir -p ${LOCAL_REPO}
 
 pushd ${LOCAL_EP_DIR}
 scp -r [email protected]:${BUILDMACHINE_BASE_DL}/${DROP_ID} .
@@ -256,10 +204,6 @@ pushd ${LOCAL_EQ_DIR}
 scp -r [email protected]:${BUILDMACHINE_BASE_EQ}/${DROP_ID_EQ} .
 popd
 
-pushd ${LOCAL_REPO}
-scp -r [email protected]:${BUILDMACHINE_BASE_SITE}/${REPO_ID} .
-popd
-
 # ### Begins the point of making modifications to the build ###
 if [[ "${DL_TYPE}" != "R" ]]
 then
@@ -323,15 +267,3 @@ pushd ${LOCAL_EP_DIR}
   fi
 
 popd
-
-
-#Promote Repository
-if [[ "${DL_TYPE}" == "R" ]]
-then
-  pushd ${LOCAL_REPO}
-    BUILDMACHINE_SITE=${LOCAL_REPO}/${REPO_ID}
-    addRepoProperties ${BUILDMACHINE_SITE} ${REPO_SITE_SEGMENT} ${DL_DROP_ID}
-    mv ${REPO_ID} ${DL_DROP_ID}
-    scp -r ${LOCAL_REPO}/${DL_DROP_ID} [email protected]:${EP_ECLIPSE_ROOT}/updates/${REPO_SITE_SEGMENT}
-  popd
-fi

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml

@@ -50,6 +50,11 @@
         <configuration>
           <includeAllDependencies>true</includeAllDependencies>
           <includeAllSources>true</includeAllSources>
+          <repositoryName>Eclipse ${releaseVersion} repository (for ${releaseYear}-${releaseMonth})</repositoryName>
+          <extraArtifactRepositoryProperties>
+            <p2.statsURI>https://download.eclipse.org/stats</p2.statsURI>
+            <p2_mirrorsURL_PLACEHOLDER/> <!-- To be replaced with the real p2.mirrorsURL upon release -->
+          </extraArtifactRepositoryProperties>
         </configuration>
       </plugin>
       <plugin>