diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile index ea4c8c78477..e272d273396 100644 --- a/JenkinsJobs/Builds/build.jenkinsfile +++ b/JenkinsJobs/Builds/build.jenkinsfile @@ -29,7 +29,6 @@ pipeline { tools { jdk 'temurin-jdk21-latest' maven 'apache-maven-latest' - ant 'apache-ant-latest' } environment { MAVEN_OPTS = '-Xmx4G' @@ -174,25 +173,6 @@ pipeline { } } } - stage('Create base builder'){ - steps { - script{ - def eclipsePlatformLatestRelease = "https://download.eclipse.org/eclipse/downloads/drops4/${PREVIOUS_RELEASE_ID}/eclipse-platform-${PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz" - def exe = utilities.installDownloadableTool('eclipse', eclipsePlatformLatestRelease) + '/eclipse' - assignEnvVariable('BASE_BUILDER_ECLIPSE_EXE', "${exe} -nosplash --launcher.suppressErrors") - sh ''' - source $CJE_ROOT/buildproperties.shsource - mkdir -p $CJE_ROOT/$TMP_DIR - $BASE_BUILDER_ECLIPSE_EXE \ - -debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \ - -application org.eclipse.equinox.p2.director \ - -repository ${ECLIPSE_RUN_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/tools/nightly/latest \ - -installIU org.eclipse.pde.api.tools,org.eclipse.cbi.p2repo.analyzers.feature.feature.group \ - -profile SDKProfile - ''' - } - } - } stage('Aggregator maven build') { environment { KEYRING = credentials('secret-subkeys-releng.asc') @@ -203,6 +183,7 @@ pipeline { dir("${AGG_DIR}") { sh '''#!/bin/bash -xe source $CJE_ROOT/buildproperties.shsource + mkdir -p ${CJE_ROOT}/${TMP_DIR} mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch \ -Dmaven.repo.local=${LOCAL_REPO} -DlocalEcjVersion=99.99 \ @@ -370,30 +351,20 @@ pipeline { popd # Generate repository reports - $BASE_BUILDER_ECLIPSE_EXE \ - -application org.eclipse.cbi.p2repo.analyzers.repoReport \ - -data $CJE_ROOT/$TMP_DIR/workspace-report -vmargs -Xmx1g \ - -DreferenceRepo=https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_REPO_ID}/${BASEBUILD_ID} \ + mvn tycho-eclipse:eclipse-run@generate-repo-report -f eclipse-platform-parent \ + -Declipserun.workArea=${CJE_ROOT}/${TMP_DIR}/repo-report \ -DreportRepoDir=${PLATFORM_REPO_DIR} \ -DreportOutputDir=${DROP_DIR}/${BUILD_ID}/buildlogs # Generate API-tools reports - pushd ${DROP_DIR}/${BUILD_ID} - $BASE_BUILDER_ECLIPSE_EXE \ - -application org.eclipse.ant.core.antRunner \ - -buildfile $ECLIPSE_BUILDER_DIR/eclipse/buildScripts/api-tools-builder.xml \ - -data $CJE_ROOT/$TMP_DIR/workspace-apitoolingsLogs \ - -DEBuilderDir=$ECLIPSE_BUILDER_DIR \ + mvn tycho-eclipse:eclipse-run@generate-api-report -f eclipse-platform-parent \ + -Declipserun.workArea=${CJE_ROOT}/${TMP_DIR}/apitoolings-logs \ + -DgitRepoRoot=${AGG_DIR} \ -DbuildDirectory=${DROP_DIR}/${BUILD_ID} \ -DbuildId=$BUILD_ID \ - -DbuildLabel=$BUILD_ID \ - -DbuildWorkingArea=${AGG_DIR} \ - -DpreviousBaseURL=https://$DOWNLOAD_HOST/eclipse/downloads/drops4/$PREVIOUS_RELEASE_ID/eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \ - -DpreviousBaselineName=Eclipse-SDK-$PREVIOUS_RELEASE_VER \ - -DpreviousBaselineFilename=eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \ - -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ - apiToolsReports - popd + -DpreviousReleaseVer=${PREVIOUS_RELEASE_VER} \ + -DpreviousReleaseId=${PREVIOUS_RELEASE_ID} \ + rm -rf ${DROP_DIR}/${BUILD_ID}/apitoolingreference # Wait for notarization to complete before checksums are generated. diff --git a/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile b/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile index bf473e0dd86..5954473257f 100644 --- a/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile +++ b/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile @@ -157,7 +157,6 @@ pipeline { "STREAM=\".*\"" : "STREAM=\"${NEXT_RELEASE_VERSION}.0\"", "STREAMMajor=\".*\"" : "STREAMMajor=\"${NEXT_RELEASE_VERSION_MAJOR}\"", "STREAMMinor=\".*\"" : "STREAMMinor=\"${NEXT_RELEASE_VERSION_MINOR}\"", - "ECLIPSE_RUN_REPO=\".*\"" : "ECLIPSE_RUN_REPO=\"https://download.eclipse.org/eclipse/updates/${NEXT_RELEASE_VERSION}-I-builds/\"", "NEXT_JAVA_RELEASE_DATE=\".*\"" : "NEXT_JAVA_RELEASE_DATE=\"${NEXT_JAVA_RELEASE_DATE}\"", ]) replaceInFile('products/eclipse-platform/platform.p2.inf', [ diff --git a/JenkinsJobs/Releng/promoteBuild.jenkinsfile b/JenkinsJobs/Releng/promoteBuild.jenkinsfile index 5cbeec7bd40..8e99732c83e 100644 --- a/JenkinsJobs/Releng/promoteBuild.jenkinsfile +++ b/JenkinsJobs/Releng/promoteBuild.jenkinsfile @@ -255,9 +255,6 @@ pipeline { -DnewPrevious-release.baseline="${RELEASE_P2_REPOSITORY}" \ -DnewCbi-ecj-version="${ecjVersion}" """ - utilities.replaceAllInFile('cje-production/buildproperties.txt', [ - 'ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/.*"' : "ECLIPSE_RUN_REPO=\"${RELEASE_P2_REPOSITORY}\"", - ]) utilities.gitCommitAllExcludingSubmodules("Update ${MAINTENANCE_BRANCH} branch with release version for ${BUILD_MAJOR}_${BUILD_MINOR}+ changes") } // Switch back to master for subsequent parts of this pipeline diff --git a/RELEASE.md b/RELEASE.md index 1626eab9bc0..08612c9acbe 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -148,7 +148,6 @@ Previously they were created in ther own job: This is still a work in progress so if there are any issues or a repo gets missed you can fall back to the old process below: Once that's done it's easiest to just grep for the previous release version or stream number to find the remaining instances that need to be updated, then commit the changes in a new branch for each repo. - **Update comparator repo and eclipse run repo** - - Update the ECLIPSE_RUN_REPO in the [cje-production](cje-production) buildproperties.txt files - **Set Previous Version to RC2** - RC2 becomes the new baseline for the week before the GA release. - Update previous-release.baseline in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml) diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index a67952b353e..db3efd4dc91 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -23,7 +23,6 @@ STREAMMajor="4" STREAMMinor="40" STREAMService="0" TMP_DIR="tmp" -DOWNLOAD_HOST="download.eclipse.org" NEXT_JAVA_RELEASE_DATE="" PREVIOUS_RELEASE_VER="4.39" @@ -32,5 +31,3 @@ PREVIOUS_RELEASE_REPO_ID="4.39" BASEBUILD_ID="R-4.39-202602260420" #release id for downloading eclipse PREVIOUS_RELEASE_ID="R-4.39-202602260420" - -ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.40-I-builds/" diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh index c0d97f7602f..9890436df6d 100755 --- a/cje-production/mbscripts/mb010_createEnvfiles.sh +++ b/cje-production/mbscripts/mb010_createEnvfiles.sh @@ -75,5 +75,4 @@ fn-addToPropFiles BUILD_ENV_FILE_PROP "\"$BUILD_ENV_FILE_PROP\"" fn-addToPropFiles BUILD_TYPE "\"${BUILD_TYPE}\"" fn-addToPropFiles BUILD_TYPE_NAME "\"${BUILD_TYPE_NAME}\"" fn-addToPropFiles BUILD_ID "\"$BUILD_TYPE$TIMESTAMP\"" -fn-addToPropFiles ECLIPSE_BUILDER_DIR "\"$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder\"" fn-addToPropFiles TEST_CONFIGURATIONS_EXPECTED "\"${TEST_CONFIGURATIONS_EXPECTED}\"" diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 217cd1873f5..55c72406c1f 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -69,13 +69,6 @@ https://download.eclipse.org/eclipse/updates/${releaseVersion}-I-builds/ - - ${eclipse-sdk-repo} - ${eclipse-sdk-repo} @@ -495,6 +488,91 @@ tycho-gpg-plugin ${tycho.version} + + org.eclipse.tycho + tycho-eclipse-plugin + ${tycho.version} + + ${eclipserun.workArea} + + + eclipse + p2 + ${eclipse-sdk-repo} + + + + + + generate-repo-report + + eclipse-run + + none + + + -application + org.eclipse.cbi.p2repo.analyzers.repoReport + + + -DreferenceRepo=${previous-release.baseline} + -DreportRepoDir=${reportRepoDir} + -DreportOutputDir=${reportOutputDir} + + + + org.eclipse.cbi.p2repo.analyzers.feature + eclipse-feature + + + + + cbi.p2repo.analyzer + p2 + https://download.eclipse.org/cbi/updates/p2-analyzers/tools/nightly/latest + + + + + + generate-api-report + + eclipse-run + + none + + + -application + org.eclipse.ant.core.antRunner + -buildfile + ${gitRepoRoot}/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml + apiToolsReports + + + -DEBuilderDir=${gitRepoRoot}/eclipse.platform.releng.tychoeclipsebuilder + -DbuildDirectory=${buildDirectory} + -DbuildId=${buildId} + -DbuildLabel=${buildId} + -DbuildWorkingArea=${gitRepoRoot} + -DpreviousBaseURL=https://download.eclipse.org/eclipse/downloads/drops4/${previousReleaseId}/eclipse-SDK-${previousReleaseVer}-win32-x86_64.zip + -DpreviousBaselineName=Eclipse-SDK-${previousReleaseVer} + -DpreviousBaselineFilename=eclipse-SDK-${previousReleaseVer}-win32-x86_64.zip + -Djava.io.tmpdir=${env.CJE_ROOT}/${env.TMP_DIR} + + + + org.eclipse.pde.api.tools + eclipse-plugin + + + org.eclipse.platform + eclipse-feature + + + + + + org.eclipse.tycho tycho-versions-plugin diff --git a/eclipse-platform-parent/saveproperties/mavenproperties.properties b/eclipse-platform-parent/saveproperties/mavenproperties.properties index 244d09f4d6a..7ac3e287f96 100644 --- a/eclipse-platform-parent/saveproperties/mavenproperties.properties +++ b/eclipse-platform-parent/saveproperties/mavenproperties.properties @@ -6,7 +6,6 @@ tycho.localArtifacts=${tycho.localArtifacts} tycho.version=${tycho.version} cbi-ecj-version=${cbi-ecj-version} cbi-plugins.version=${cbi-plugins.version} -eclipserun-repo=${eclipserun-repo} java.class.path=${java.class.path} java.class.version=${java.class.version}