Merge branch 'eclipse-platform:master' into master

SougandhS · Dec 5, 2024 · 84324ed · 84324ed
2 parents 562d1b6 + 36763d2
commit 84324ed
Show file tree

Hide file tree

Showing 149 changed files with 578 additions and 1,361 deletions.
diff --git a/.github/workflows/checkVersions.yml b/.github/workflows/checkVersions.yml
@@ -37,7 +37,7 @@ jobs:
         maven-version: 3.9.9
 
     - name: Check and increment versions
-      uses: Wandalen/wretry.action@8ceaefd717b7cdae4f2637f9a433242ade421a0a # master
+      uses: Wandalen/wretry.action@ffdd254f4eaf1562b8a2c66aeaa37f1ff2231179 # master
       with:
         attempt_delay: 200
         attempt_limit: 10

diff --git a/.github/workflows/prepareRelease.yml b/.github/workflows/prepareRelease.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Update Main Versions
       run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
     - name: Update Release Versions
-      run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
+      run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property -Dproperties=releaseVersion,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewreleaseVersion=${{ github.event.milestone.title }}
     - name: Create Pull Request for Release ${{ github.event.milestone.title }}
       uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
       with:

diff --git a/.github/workflows/updateRelease.yml b/.github/workflows/updateRelease.yml
@@ -23,20 +23,9 @@ jobs:
         cache: maven
     - name: Update Versions
       run: >-
-          mvn -U -Pbuild-individual-bundles -ntp
+          mvn -U -B -ntp
           org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
           org.eclipse.tycho:tycho-versions-plugin:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
-    - name: Build and Bump Versions
-      uses: Wandalen/wretry.action@8ceaefd717b7cdae4f2637f9a433242ade421a0a # master
-      with:
-        attempt_delay: 120000
-        attempt_limit: 10
-        command: >-
-            mvn -U -Pbuild-individual-bundles -ntp
-            clean verify
-            -DskipTests
-            -Dcompare-version-with-baselines.skip=false
-            org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100
     - name: Create Pull Request for Release ${{ github.event.milestone.title }}
       uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
       with:
@@ -49,5 +38,3 @@ jobs:
         add-paths: |
             pom.xml
             **/pom.xml
-            **/*.MF
-
diff --git a/JenkinsJobs/AutomatedTests/I_unit_mac.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
@@ -38,7 +38,6 @@ pipeline {
               ANT_HOME = tool(type:'ant', name:'apache-ant-latest')
               PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"
               ANT_OPTS = "-Djava.io.tmpdir=${WORKSPACE}/tmp -Djava.security.manager=allow"
-              eclipseArch = \'''' + ARCH + ''''
           }
           steps {
               cleanWs() // workspace not cleaned by default
@@ -75,7 +74,7 @@ java -XshowSettings -version 1>javaSettings.txt 2>&1
 
 ant -f getEBuilder.xml -DbuildId=${buildId} -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH} \\
   -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\
-  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=${eclipseArch} \\
+  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=''' + ARCH + ''' \\
   -DtestSuite=all
 # For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903
               \'\'\'

diff --git a/JenkinsJobs/Builds/AddToPComposite.groovy b/JenkinsJobs/Builds/AddToPComposite.groovy
@@ -10,7 +10,7 @@ for (STREAM in STREAMS){
       stringParam('buildId', null, 'Build ID of the build to be added.')
     }
 
-    label('centos-latest')
+    label('basic')
 
     logRotator {
       daysToKeep(3)

diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
@@ -17,15 +17,15 @@ for (STREAM in STREAMS){
 # format: Minute Hour Day Month Day of the week (0-7)
 
 # - - - Integration Eclipse SDK builds - - - 
-# 2024-12 Release Schedule
+# 2025-03 Release Schedule
 # Normal : 6 PM every day (1/6 - 2/9)
-# 0 18 * * *
+0 18 * * *
 
 
 # Milestone/RC Schedule 
 # Post M1, no nightlies, I-builds only. (Be sure to "turn off" for tests and sign off days)
-0 6 9-20 11 5-7,1-3
-0 18 9-20 11 5-7,1-3
+# 0 6 14-26 2 5-7,1-3
+# 0 18 14-26 2 5-7,1-3
             """)
           }
         }
@@ -55,7 +55,7 @@ pipeline {
 	}
   agent {
     kubernetes {
-      inheritFrom 'centos-8'
+      inheritFrom 'ubuntu-2404'
       yaml """
 apiVersion: v1
 kind: Pod
@@ -247,7 +247,7 @@ spec:
 	  stage('Aggregator maven build'){
 	      environment {
                 KEYRING = credentials('secret-subkeys-releng.asc')
-                KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
+                MAVEN_GPG_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
           }
           steps {
               container('jnlp') {
@@ -423,11 +423,16 @@ spec:
               build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macosx-aarch64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
               build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macosx-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
               build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-win32-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'SmokeTests/Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
             }
           }
 		}
 		stage('Trigger publication to Maven snapshots repo') {
+			when {
+				environment name: 'COMPARATOR_ERRORS_SUBJECT', value: ''
+				// On comparator-erros, skip the deployment of snapshot version to the 'eclipse-snapshots' maven repository to prevent that ECJ snapshot
+				// from being used in verification builds. Similar to how the p2-repository is not added to the I-build composite in that case.
+			}
 			steps {
               container('jnlp') {
 				build job: 'CBIaggregator', parameters: [string(name: 'snapshotOrRelease', value: '-snapshot')], wait: false

diff --git a/JenkinsJobs/Builds/markStable.groovy b/JenkinsJobs/Builds/markStable.groovy
@@ -6,7 +6,7 @@ job('Builds/markStable'){
     stringParam('buildId', null, 'ID of the build to be marked stable.')
   }
 
-  label('centos-8')
+  label('basic')
 
   logRotator {
     daysToKeep(3)

diff --git a/JenkinsJobs/Builds/markUnstable.groovy b/JenkinsJobs/Builds/markUnstable.groovy
@@ -8,7 +8,7 @@ job('Builds/markUnstable'){
     stringParam('issueUrl', null, 'URL for the issue.')
   }
 
-  label('centos-8')
+  label('basic')
 
   logRotator {
     daysToKeep(3)

diff --git a/JenkinsJobs/Cleanup/cleanupDLsite.groovy b/JenkinsJobs/Cleanup/cleanupDLsite.groovy
@@ -3,7 +3,7 @@ job('rt.equinox.releng.cleanupDLsite'){
     cron('45 7 * * *')
   }
 
-  label('centos-latest')
+  label('basic')
 
   logRotator {
     daysToKeep(10)

diff --git a/JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy b/JenkinsJobs/Cleanup/cleanupReleaseArtifacts.groovy
@@ -2,7 +2,7 @@ job('Cleanup/cleanupReleaseArtifacts'){
   displayName('Cleanup Release Artifacts')
   description('Cleanup major artifacts from previous releases at the beginning of a new release.')
 
-  label('centos-latest')
+  label('basic')
 
   logRotator {
     daysToKeep(1)

diff --git a/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy b/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy
@@ -12,7 +12,7 @@ and other such scripts.
     numToKeep(5)
   }
 
-  label('centos-latest')
+  label('basic')
 
   triggers {
     cron('''

diff --git a/JenkinsJobs/Cleanup/pruneDailyRepos.groovy b/JenkinsJobs/Cleanup/pruneDailyRepos.groovy
@@ -13,7 +13,7 @@ and other such scripts.
   }
 
 
-  label('centos-latest')
+  label('basic')
 
   triggers {
     cron('''

diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json
@@ -1,8 +1,8 @@
 {
     "Streams": [
-        "4.34"
+        "4.35"
     ],
     "Branches": {
-		"4.34": "master"
+		"4.35": "master"
     }
 }
diff --git a/JenkinsJobs/Releng/CBIaggregator.groovy b/JenkinsJobs/Releng/CBIaggregator.groovy
@@ -10,7 +10,7 @@ job('Releng/CBIaggregator'){
     choiceParam('snapshotOrRelease', ['release', 'snapshot'], null)
   }
 
-  label('centos-latest')
+  label('basic')
 
   jdk('openjdk-jdk11-latest')
 

diff --git a/JenkinsJobs/Releng/PublishJDTtoMaven.groovy b/JenkinsJobs/Releng/PublishJDTtoMaven.groovy
@@ -6,7 +6,7 @@ job('Releng/PublishJDTtoMaven'){
     stringParam('REPO_ID', null, 'ID (buildNo) of repository created by CBI aggregator job.')
   }
 
-  label('centos-latest')
+  label('basic')
 
   jdk('openjdk-jdk11-latest')
 

diff --git a/JenkinsJobs/Releng/PublishPDEToMaven.groovy b/JenkinsJobs/Releng/PublishPDEToMaven.groovy
@@ -6,7 +6,7 @@ job('Releng/PublishPDEToMaven'){
     stringParam('REPO_ID', null, 'ID (buildNo) of repository created by CBI aggregator job.')
   }
 
-  label('centos-latest')
+  label('basic')
 
   jdk('openjdk-jdk11-latest')
 

diff --git a/JenkinsJobs/Releng/PublishPlatformToMaven.groovy b/JenkinsJobs/Releng/PublishPlatformToMaven.groovy
@@ -6,7 +6,7 @@ job('Releng/PublishPlatformToMaven'){
     stringParam('REPO_ID', null, 'ID (buildNo) of repository created by CBI aggregator job.')
   }
 
-  label('centos-latest')
+  label('basic')
 
   jdk('openjdk-jdk11-latest')
 

diff --git a/JenkinsJobs/Releng/checkCompositesValidity.groovy b/JenkinsJobs/Releng/checkCompositesValidity.groovy
@@ -8,7 +8,7 @@ job('Releng/checkCompositesValidity'){
 
   jdk('adoptopenjdk-hotspot-jdk11-latest')
 
-  label('centos-8')
+  label('basic')
 
   triggers {
     cron {

diff --git a/JenkinsJobs/Releng/collectPerfResults.groovy b/JenkinsJobs/Releng/collectPerfResults.groovy
@@ -8,7 +8,7 @@ job('Releng/collectPerfResults'){
     stringParam('buildID', null, 'ID of the I-build being tested.')
   }
 
-  label('centos-8')
+  label('basic')
 
   logRotator {
     daysToKeep(5)

diff --git a/JenkinsJobs/Releng/collectResults.groovy b/JenkinsJobs/Releng/collectResults.groovy
@@ -8,7 +8,7 @@ job('Releng/ep-collectResults'){
     stringParam('buildID', null, 'ID of the I-build being tested.')
   }
 
-  label('centos-8')
+  label('basic')
 
   logRotator {
     daysToKeep(5)

diff --git a/JenkinsJobs/Releng/createGenericComposites.groovy b/JenkinsJobs/Releng/createGenericComposites.groovy
@@ -14,7 +14,7 @@ job('Releng/createGenericComposites'){
 
   jdk('openjdk-jdk11-latest')
 
-  label('centos-8')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()

diff --git a/JenkinsJobs/Releng/createMaintenanceBranch.groovy b/JenkinsJobs/Releng/createMaintenanceBranch.groovy
@@ -12,7 +12,7 @@ job('Releng/createMaintenanceBranch'){
     stringParam('tag', null, 'Release tag to be used when making the branch. For example: S4_26_0_RC2')
   }
 
-  label('centos-latest')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()
@@ -28,7 +28,7 @@ function fn_toPushRepo() {
 	if ! [[ "$from" == http* ]]; then
 		echo $from
 	else
-		echo $(sed -e 's,http://git.eclipse.org/gitroot,ssh://[email protected]:29418,' -e 's,https://git.eclipse.org/r,ssh://[email protected]:29418,' -e 's,https://github.com/,[email protected]:,' <<< $from)
+		echo $(sed -e 's,https://github.com/,[email protected]:,' <<< $from)
 	fi
 }
 

diff --git a/JenkinsJobs/Releng/makeVisible.groovy b/JenkinsJobs/Releng/makeVisible.groovy
@@ -28,7 +28,7 @@ I-builds promote to 'S' until 'R'.
 
   jdk('adoptopenjdk-hotspot-jdk11-latest')
 
-  label('centos-8')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()

diff --git a/JenkinsJobs/Releng/newStreamRepos.groovy b/JenkinsJobs/Releng/newStreamRepos.groovy
@@ -11,7 +11,7 @@ job('Releng/newStreamRepos'){
     stringParam('streamVersion', null, 'The stream version for which repos should be initialized.')
   }
 
-  label('centos-latest')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()

diff --git a/JenkinsJobs/Releng/renameAndPromote.groovy b/JenkinsJobs/Releng/renameAndPromote.groovy
@@ -32,7 +32,7 @@ S is used for milestones and includes the milestone version. For example: S4_25_
 
   jdk('adoptopenjdk-hotspot-jdk11-latest')
 
-  label('centos-latest')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()

diff --git a/JenkinsJobs/Releng/tagEclipseRelease.groovy b/JenkinsJobs/Releng/tagEclipseRelease.groovy
@@ -21,7 +21,7 @@ GitHub issue (or legacy bugzilla bug ID) to track tagging the release, for examp
 
   jdk('oracle-jdk8-latest')
 
-  label('centos-latest')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()
@@ -63,7 +63,7 @@ function toPushRepo() {
 	if ! [[ "$from" == http* ]]; then
 		echo $from
 	else
-		echo $(sed -e 's,http://git.eclipse.org/gitroot,ssh://[email protected]:29418,' -e 's,https://git.eclipse.org/r,ssh://[email protected]:29418,' -e 's/https:\\/\\/github.com/ssh:\\/\\/[email protected]/g' <<< $from)
+		echo $(sed -e 's/https:\\/\\/github.com/ssh:\\/\\/[email protected]/g' <<< $from)
 	fi
 }
 

diff --git a/JenkinsJobs/Releng/updateIndex.groovy b/JenkinsJobs/Releng/updateIndex.groovy
@@ -8,7 +8,7 @@ job('Releng/updateIndex'){
 
   jdk('openjdk-jdk11-latest')
 
-  label('centos-8')
+  label('basic')
 
   wrappers { //adds pre/post actions
     timestamps()

diff --git a/JenkinsJobs/SmokeTests/FOLDER.groovy b/JenkinsJobs/SmokeTests/FOLDER.groovy
@@ -1,4 +1,24 @@
 folder('SmokeTests') {
   displayName('Smoke Tests')
   description('Folder for Smoke Tests')
-}
+}
+
+pipelineJob('SmokeTests/Start-smoke-tests'){
+	description('Start all smoke tests for the Eclipse SDK')
+	parameters {  // Define parameters in job configuration to make them already available in the very first build
+		stringParam {
+			name('buildId')
+			description('Build Id to test (such as I20240611-1800, N20120716-0800).')
+			trim(true)
+		}
+	}
+	definition {
+		cpsScm {
+			lightweight(true)
+			scm {
+				github('eclipse-platform/eclipse.platform.releng.aggregator', 'master')
+			}
+			scriptPath('JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile')
+		}
+	}
+}