diff --git a/Jenkinsfile b/Jenkinsfile index 09a85bcc982..9575fb4b039 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,18 +6,18 @@ pipeline { } parameters { - choice(name: 'TARGET_PLATFORM', choices: ['r202403', 'r202406', 'r202409', 'r202412', 'latest'], description: 'Which Target Platform should be used?') + choice(name: 'TARGET_PLATFORM', choices: ['latest', 'r202203', 'r202206', 'r202209', 'r202212', 'r202303', 'r202306', 'r202309', 'r202312', 'r202403', 'r202406', 'r202409'], description: 'Which Target Platform should be used?') // see https://wiki.eclipse.org/Jenkins#JDK - choice(name: 'JDK_VERSION', choices: [ '17', '21' ], description: 'Which JDK version should be used?') + choice(name: 'JDK_VERSION', choices: [ '21' , '17'], description: 'Which JDK version should be used?') } triggers { - parameterizedCron(env.BRANCH_NAME == 'main' ? ''' - H H(0-1) * * * %TARGET_PLATFORM=r202403;JDK_VERSION=17 - H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=21 + parameterizedCron(env.BRANCH_NAME == 'cd_tycho50' ? ''' + H H(13-14) * * * %TARGET_PLATFORM=latest;JDK_VERSION=17 ''' : '') } + options { buildDiscarder(logRotator(numToKeepStr:'10')) disableConcurrentBuilds() @@ -65,7 +65,12 @@ pipeline { steps { xvnc(useXauthority: true) { sh """ +<<<<<<< HEAD ./full-build.sh --tp=${selectedTargetPlatform()} \ +======= + ./full-build.sh -Dsurefire.timeout=3000 --tp=${selectedTargetPlatform()} \ + ${javaVersion() == 11 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-11' : ''} \ +>>>>>>> 6247413133 (test tycho 5.0) ${javaVersion() == 17 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-17' : ''} \ ${javaVersion() == 21 ? '-Pstrict-jdk-21' : ''} """ @@ -97,7 +102,7 @@ pipeline { archiveArtifacts artifacts: 'build/**, **/target/work/data/.metadata/.log, **/target/work/data/.metadata/bak*.log' } unsuccessful { - archiveArtifacts artifacts: 'org.eclipse.xtend.ide.swtbot.tests/screenshots/**, **/target/work/data/.metadata/.log, **/target/work/data/.metadata/bak*.log, **/hs_err_pid*.log' + archiveArtifacts artifacts: 'org.eclipse.xtend.ide.swtbot.tests/screenshots/**, **/target/work/data/.metadata/.log, **/target/work/data/.metadata/bak*.log, **/hs_err_pid*.log, **/target/surefire-reports/*' } cleanup { script { diff --git a/pom.xml b/pom.xml index 9f8c73358d7..f87ed6be972 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ ISO-8859-1 - 4.0.10 + 5.0.0-SNAPSHOT 17 17 @@ -848,6 +848,13 @@ + + + tycho-snapshots + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + + + ossrh