Skip to content

Commit a32a291

Browse files
pdulthpdulth
committed
[releng] Update target platform
1 parent 31451b3 commit a32a291

5 files changed

Lines changed: 107 additions & 157 deletions

File tree

‎Jenkinsfile‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
pipeline {
2-
agent { label 'migration' }
3-
tools {
4-
maven 'apache-maven-latest'
5-
jdk 'openjdk-jdk11-latest'
6-
}
7-
environment {
8-
FROM_PR = "${BRANCH_NAME}".contains("PR-");
9-
10-
BUILD_KEY = "${BRANCH_NAME}-${BUILD_ID}".replaceFirst(/^v/, "").replaceAll('/','-');
11-
SUB_BRANCH = "${FROM_PR}".replace("true", "${CHANGE_TARGET}").replace("false", "${BRANCH_NAME}");
12-
13-
SSH_ACCOUNT = "genie.diffmerge@projects-storage.eclipse.org"
14-
BUILD_DIR = "/home/data/httpd/download.eclipse.org/diffmerge/nightly/${BUILD_KEY}"
15-
16-
NIGHTLY_KEY = "${BRANCH_NAME}".replaceFirst(/^v/, "").replaceAll('/','-');
17-
NIGHTLY_DIR = "/home/data/httpd/download.eclipse.org/diffmerge/nightly/${NIGHTLY_KEY}"
18-
}
19-
stages {
20-
stage('Package') {
21-
steps {
22-
sh 'env'
23-
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
24-
sh 'mvn clean install -t ${WORKSPACE}/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml -Psign -Pstandalone -Pgui.test'
25-
junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml'
26-
}
27-
}
28-
}
29-
stage('Publish artifacts') {
30-
steps {
31-
sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
32-
sh "ssh $SSH_ACCOUNT mkdir -p $BUILD_DIR/emf-diffmerge-site"
33-
sh "scp -rp $WORKSPACE/releng/org.eclipse.emf.diffmerge.update/target/repository/* $SSH_ACCOUNT:$BUILD_DIR/emf-diffmerge-site"
34-
35-
sh "ssh $SSH_ACCOUNT mkdir -p $BUILD_DIR/standalone"
36-
sh "scp -rp $WORKSPACE/releng/org.eclipse.emf.diffmerge.update/target/standalone/*dependencies*.jar $SSH_ACCOUNT:$BUILD_DIR/standalone/"
37-
}
38-
script {
39-
currentBuild.description = "${BUILD_KEY} - <a href=\"https://download.eclipse.org/diffmerge/nightly/${BUILD_KEY}\">site</a>"
40-
}
41-
}
42-
}
43-
stage('Publish nightly') {
44-
when {
45-
expression {
46-
!"${BRANCH_NAME}".contains('PR-')
47-
}
48-
}
49-
steps {
50-
sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
51-
sh "ssh ${SSH_ACCOUNT} mkdir -p ${NIGHTLY_DIR}"
52-
sh "ssh ${SSH_ACCOUNT} rm -rf ${NIGHTLY_DIR}/emf-diffmerge-site"
53-
sh "ssh ${SSH_ACCOUNT} cp -r ${BUILD_DIR}/emf-diffmerge-site ${NIGHTLY_DIR}"
54-
sh "ssh ${SSH_ACCOUNT} rm -rf ${NIGHTLY_DIR}/standalone"
55-
sh "ssh ${SSH_ACCOUNT} cp -r ${BUILD_DIR}/standalone ${NIGHTLY_DIR}"
56-
}
57-
}
58-
}
59-
stage('Trigger childs') {
60-
steps {
61-
build job: "diffmerge-coevolution/${SUB_BRANCH}", parameters: [string(name: 'CORE_BRANCH', value:"${BUILD_KEY}")], wait: false
62-
build job: "diffmerge-patterns/${SUB_BRANCH}", parameters: [string(name: 'CORE_BRANCH', value:"${BUILD_KEY}")], wait: false
63-
}
64-
}
65-
}
66-
67-
post {
68-
always {
69-
archiveArtifacts artifacts: '**/*.log, *.log, **/*.xml, *.exec', allowEmptyArchive: true
70-
}
71-
}
1+
pipeline {
2+
agent { label 'migration' }
3+
tools {
4+
maven 'apache-maven-latest'
5+
jdk 'openjdk-jdk17-latest'
6+
}
7+
environment {
8+
FROM_PR = "${BRANCH_NAME}".contains("PR-");
9+
10+
BUILD_KEY = "${BRANCH_NAME}-${BUILD_ID}".replaceFirst(/^v/, "").replaceAll('/','-');
11+
SUB_BRANCH = "${FROM_PR}".replace("true", "${CHANGE_TARGET}").replace("false", "${BRANCH_NAME}");
12+
13+
SSH_ACCOUNT = "genie.diffmerge@projects-storage.eclipse.org"
14+
BUILD_DIR = "/home/data/httpd/download.eclipse.org/diffmerge/nightly/${BUILD_KEY}"
15+
16+
NIGHTLY_KEY = "${BRANCH_NAME}".replaceFirst(/^v/, "").replaceAll('/','-');
17+
NIGHTLY_DIR = "/home/data/httpd/download.eclipse.org/diffmerge/nightly/${NIGHTLY_KEY}"
18+
}
19+
stages {
20+
stage('Package') {
21+
steps {
22+
sh 'env'
23+
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
24+
sh 'mvn clean install -t ${WORKSPACE}/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml -Psign -Pstandalone -Pgui.test'
25+
junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml'
26+
}
27+
}
28+
}
29+
stage('Publish artifacts') {
30+
steps {
31+
sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
32+
sh "ssh $SSH_ACCOUNT mkdir -p $BUILD_DIR/emf-diffmerge-site"
33+
sh "scp -rp $WORKSPACE/releng/org.eclipse.emf.diffmerge.update/target/repository/* $SSH_ACCOUNT:$BUILD_DIR/emf-diffmerge-site"
34+
35+
sh "ssh $SSH_ACCOUNT mkdir -p $BUILD_DIR/standalone"
36+
sh "scp -rp $WORKSPACE/releng/org.eclipse.emf.diffmerge.update/target/standalone/*dependencies*.jar $SSH_ACCOUNT:$BUILD_DIR/standalone/"
37+
}
38+
script {
39+
currentBuild.description = "${BUILD_KEY} - <a href=\"https://download.eclipse.org/diffmerge/nightly/${BUILD_KEY}\">site</a>"
40+
}
41+
}
42+
}
43+
stage('Publish nightly') {
44+
when {
45+
expression {
46+
!"${BRANCH_NAME}".contains('PR-')
47+
}
48+
}
49+
steps {
50+
sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
51+
sh "ssh ${SSH_ACCOUNT} mkdir -p ${NIGHTLY_DIR}"
52+
sh "ssh ${SSH_ACCOUNT} rm -rf ${NIGHTLY_DIR}/emf-diffmerge-site"
53+
sh "ssh ${SSH_ACCOUNT} cp -r ${BUILD_DIR}/emf-diffmerge-site ${NIGHTLY_DIR}"
54+
sh "ssh ${SSH_ACCOUNT} rm -rf ${NIGHTLY_DIR}/standalone"
55+
sh "ssh ${SSH_ACCOUNT} cp -r ${BUILD_DIR}/standalone ${NIGHTLY_DIR}"
56+
}
57+
}
58+
}
59+
stage('Trigger childs') {
60+
steps {
61+
build job: "diffmerge-coevolution/${SUB_BRANCH}", parameters: [string(name: 'CORE_BRANCH', value:"${BUILD_KEY}")], wait: false
62+
build job: "diffmerge-patterns/${SUB_BRANCH}", parameters: [string(name: 'CORE_BRANCH', value:"${BUILD_KEY}")], wait: false
63+
}
64+
}
65+
}
66+
67+
post {
68+
always {
69+
archiveArtifacts artifacts: '**/*.log, *.log, **/*.xml, *.exec', allowEmptyArchive: true
70+
}
71+
}
7272
}

‎releng/org.eclipse.emf.diffmerge.configuration/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<version>${tycho.version}</version>
3939
<configuration>
4040
<targetDefinitionIncludeSource>ignore</targetDefinitionIncludeSource>
41-
<executionEnvironment>JavaSE-11</executionEnvironment>
41+
<executionEnvironment>JavaSE-17</executionEnvironment>
4242
<target>
4343
<artifact>
4444
<groupId>org.eclipse.emf.diffmerge</groupId>
@@ -90,7 +90,7 @@
9090
<configuration>
9191
<toolchains>
9292
<jdk>
93-
<id>JavaSE-${java.version}</id>
93+
<id>JavaSE-17</id>
9494
</jdk>
9595
</toolchains>
9696
</configuration>

‎releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml‎

Lines changed: 19 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,20 @@
1-
<toolchains>
2-
<toolchain>
3-
<type>jdk</type>
4-
<provides>
5-
<id>JavaSE-11</id>
6-
</provides>
7-
<configuration>
8-
<jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome>
9-
</configuration>
10-
</toolchain>
11-
<toolchain>
12-
<type>jdk</type>
13-
<provides>
14-
<id>JavaSE-1.8</id>
15-
</provides>
16-
<configuration>
17-
<jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
18-
<bootClassPath>
19-
<includes>
20-
<include>jre/lib/*</include>
21-
<include>jre/lib/ext/*</include>
22-
<include>jre/lib/endorsed*</include>
23-
</includes>
24-
</bootClassPath>
25-
</configuration>
26-
</toolchain>
27-
<toolchain>
28-
<type>jdk</type>
29-
<provides>
30-
<id>JavaSE-1.7</id>
31-
</provides>
32-
<configuration>
33-
<jdkHome>/opt/tools/java/oracle/jdk-7/latest</jdkHome>
34-
<bootClassPath>
35-
<includes>
36-
<include>jre/lib/*</include>
37-
<include>jre/lib/ext/*</include>
38-
<include>jre/lib/endorsed*</include>
39-
</includes>
40-
</bootClassPath>
41-
</configuration>
42-
</toolchain>
43-
<toolchain>
44-
<type>jdk</type>
45-
<provides>
46-
<id>JavaSE-1.6</id>
47-
</provides>
48-
<configuration>
49-
<jdkHome>/opt/tools/java/oracle/jdk-6/latest</jdkHome>
50-
<bootClassPath>
51-
<includes>
52-
<include>jre/lib/*</include>
53-
<include>jre/lib/ext/*</include>
54-
<include>jre/lib/endorsed*</include>
55-
</includes>
56-
</bootClassPath>
57-
</configuration>
58-
</toolchain>
59-
<toolchain>
60-
<type>jdk</type>
61-
<provides>
62-
<id>J2SE-1.5</id>
63-
</provides>
64-
<configuration>
65-
<jdkHome>/opt/tools/java/oracle/jdk-5/latest</jdkHome>
66-
<bootClassPath>
67-
<includes>
68-
<include>jre/lib/*</include>
69-
<include>jre/lib/ext/*</include>
70-
<include>jre/lib/endorsed*</include>
71-
</includes>
72-
</bootClassPath>
73-
</configuration>
74-
</toolchain>
1+
<toolchains>
2+
<toolchain>
3+
<type>jdk</type>
4+
<provides>
5+
<id>JavaSE-11</id>
6+
</provides>
7+
<configuration>
8+
<jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome>
9+
</configuration>
10+
</toolchain>
11+
<toolchain>
12+
<type>jdk</type>
13+
<provides>
14+
<id>JavaSE-17</id>
15+
</provides>
16+
<configuration>
17+
<jdkHome>/opt/tools/java/openjdk/jdk-17/latest</jdkHome>
18+
</configuration>
19+
</toolchain>
7520
</toolchains>

‎releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
77
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
8-
<repository id="GMF-Notation-1.13.1" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/>
8+
<repository id="GMF-Notation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/>
99
</location>
1010
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
1111
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
1212
<unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
13-
<repository id="GMF-Runtime-1.15.3" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
13+
<repository id="GMF-Runtime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202401081627"/>
14+
</location>
15+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
16+
<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
17+
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
18+
<repository id="GEF-Classic" location="https://download.eclipse.org/tools/gef/classic/releases/3.17.0"/>
1419
</location>
1520
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
1621
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -25,8 +30,6 @@
2530
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
2631
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
2732
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="0.0.0"/>
28-
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
29-
<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
3033
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
3134
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
3235
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="0.0.0"/>
@@ -41,7 +44,7 @@
4144
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
4245
<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
4346
<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
44-
<repository location="https://download.eclipse.org/sirius/updates/stable/7.2.0-S20230411-075209/2023-03"/>
47+
<repository location="https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240408-053509/2023-03"/>
4548
</location>
4649
</locations>
4750
</target>

‎releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@ target "org.eclipse.emf.diffmerge"
22

33
with source, requirements
44

5-
location GMF-Notation-1.13.1 "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" {
5+
location GMF-Notation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" {
66
org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
77
}
88

9-
location GMF-Runtime-1.15.3 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/" {
9+
location GMF-Runtime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907" {
1010
org.eclipse.gmf.runtime.sdk.feature.group lazy
1111
org.eclipse.gmf.runtime.thirdparty.feature.group lazy
1212
}
13+
location GEF-Classic "https://download.eclipse.org/tools/gef/classic/releases/3.17.0" {
14+
org.eclipse.gef.feature.group lazy
15+
org.eclipse.draw2d.feature.group lazy
16+
}
1317

1418
location "http://download.eclipse.org/cbi/updates/license/" {
1519
org.eclipse.license.feature.group lazy
@@ -24,8 +28,6 @@ location "http://download.eclipse.org/releases/2023-03" {
2428
org.eclipse.ecf.core.ssl.feature.feature.group lazy
2529
org.eclipse.ecf.filetransfer.ssl.feature.feature.group lazy
2630
org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group lazy
27-
org.eclipse.draw2d.feature.group lazy
28-
org.eclipse.gef.feature.group lazy
2931
org.eclipse.jgit.feature.group lazy
3032
org.eclipse.jgit.ssh.apache.feature.group lazy
3133
org.eclipse.jgit.ssh.jsch.feature.group lazy
@@ -37,7 +39,7 @@ location "http://download.eclipse.org/releases/2023-03" {
3739
com.google.guava lazy
3840
}
3941

40-
location "https://download.eclipse.org/sirius/updates/stable/7.2.0-S20230411-075209/2023-03" {
42+
location "https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240408-053509/2023-03" {
4143
org.eclipse.sirius.specifier.feature.group lazy
4244
org.eclipse.sirius.runtime.ide.ui.feature.group lazy
4345
}

0 commit comments

Comments
 (0)