Bug 566651: No longer flatten build on release day

This is the step for uploading the build in the correct format.
The RELEASING.md steps still need some updates.

Change-Id: I29f033dd8dfed05500135fdbadd430efb80a1113

2 files changed, 4 insertions, 2 deletions

diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.Jenkinsfile b/releng/org.eclipse.epp.config/tools/promote-a-build.Jenkinsfile
index 5e8ced2c..41073788 100644
--- a/releng/org.eclipse.epp.config/tools/promote-a-build.Jenkinsfile
+++ b/releng/org.eclipse.epp.config/tools/promote-a-build.Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
     booleanParam(defaultValue: true, description: 'Do a dry run of the build. Everything will be done except the final copy to download which will be echoed', name: 'DRY_RUN')
     string(defaultValue: '2020-09', description: 'The release name. Release is uploaded to https://download.eclipse.org/technology/epp/downloads/release/RELEASE_NAME', name: 'RELEASE_NAME')
     string(defaultValue: 'M3', description: 'The name of the milestone, e.g. M1, M2, M3, RC1 or R', name: 'RELEASE_MILESTONE')
-    string(defaultValue: 'M3', description: 'The name of the directory to place the release, generally the same as RELEASE_MILESTONE except for R builds when it should be RC2 (or RC2a, etc for respins)', name: 'RELEASE_DIR')
+    string(defaultValue: '202009101200', description: 'The name of the directory to place the release, generally the timestamp', name: 'RELEASE_DIR')
     string(defaultValue: '12345', description: 'The CI build number being promoted from of job simrel.epp-tycho-build', name: 'BUILD_NUMBER')
   }
   options {
diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.sh b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
index 2300d5e0..2d19b98b 100755
--- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh
+++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
@@ -86,9 +86,11 @@ popd # leave downloads
 # ----------------------------------------------------------------------------------------------
 # Prepare compositeArtifacts.jar/compositeContent.jar
 pushd p2
-if [ "$RELEASE_MILESTONE" != "M1" ]; then
+if [ "$RELEASE_MILESTONE" != "M1" ] && [ "$RELEASE_MILESTONE" != "RC2" ]; then
     # For non M1 build we need to add to the existing p2 content,
     # for M1 we start from scratch
+
+    # For RC2 build the composite should have just the release in it
     cp -rp ${REPO}/* .
 fi
 mv repository ${RELEASE_DIR}