From 0008788c3b16845b0758f8808edd2c87f4310501 Mon Sep 17 00:00:00 2001 From: Quentin Le Menez Date: Thu, 7 Feb 2019 14:41:39 +0100 Subject: Bug 542929 - [Releng] [CDO] Rewire the way tests are compiled in order to allow multiple tests configurations - Update modified pom.xml files headers - Delete .project files in root and releng Change-Id: I6c76f0adb7a7c18baa4d45d78af62db4dfa69a5d Signed-off-by: Quentin Le Menez --- releng/tests/main-tests-with-cdo/README | 8 + releng/tests/main-tests-with-cdo/pom.xml | 19 ++ ...se.papyrus.main.tests.cdo.eclipse.target.target | 125 ++++++++++++ .../targetPlatform/eclipse/pom.xml | 15 ++ .../main-tests-with-cdo/targetPlatform/pom.xml | 41 ++++ ...e.papyrus.main.tests.cdo.portable.target.target | 125 ++++++++++++ ...ipse.papyrus.main.tests.cdo.portable.target.tpd | 20 ++ .../targetPlatform/portable/pom.xml | 15 ++ releng/tests/main-tests/pom.xml | 20 ++ ...clipse.papyrus.main.tests.eclipse.target.target | 113 ++++++++++ .../main-tests/targetPlatform/eclipse/pom.xml | 15 ++ releng/tests/main-tests/targetPlatform/pom.xml | 42 ++++ ...lipse.papyrus.main.tests.portable.target.target | 113 ++++++++++ ....eclipse.papyrus.main.tests.portable.target.tpd | 18 ++ .../main-tests/targetPlatform/portable/pom.xml | 15 ++ releng/tests/pom.xml | 227 +++++++++++++++++++++ 16 files changed, 931 insertions(+) create mode 100755 releng/tests/main-tests-with-cdo/README create mode 100755 releng/tests/main-tests-with-cdo/pom.xml create mode 100644 releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target create mode 100755 releng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml create mode 100755 releng/tests/main-tests-with-cdo/targetPlatform/pom.xml create mode 100644 releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target create mode 100755 releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd create mode 100755 releng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml create mode 100644 releng/tests/main-tests/pom.xml create mode 100644 releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target create mode 100644 releng/tests/main-tests/targetPlatform/eclipse/pom.xml create mode 100644 releng/tests/main-tests/targetPlatform/pom.xml create mode 100644 releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target create mode 100644 releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd create mode 100644 releng/tests/main-tests/targetPlatform/portable/pom.xml create mode 100755 releng/tests/pom.xml (limited to 'releng/tests') diff --git a/releng/tests/main-tests-with-cdo/README b/releng/tests/main-tests-with-cdo/README new file mode 100755 index 00000000000..3016fb9fc7a --- /dev/null +++ b/releng/tests/main-tests-with-cdo/README @@ -0,0 +1,8 @@ +In order to run the Papyrus Tests, with CDO installed, we need to define the target platform in the Eclipse launch config: + + +On Hudson, we must configure the job with the same information. + +We are not able to run the job with the expected target platform due to the current Papyrus pom architecture. +Without this information, maven uses the 'normal' target platform defined for the Papyrus tests. + \ No newline at end of file diff --git a/releng/tests/main-tests-with-cdo/pom.xml b/releng/tests/main-tests-with-cdo/pom.xml new file mode 100755 index 00000000000..f53e9762914 --- /dev/null +++ b/releng/tests/main-tests-with-cdo/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + org.eclipse.papyrus + org.eclipse.papyrus.tests.releng + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.tests.cdo.releng + pom + + + targetPlatform + + + diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target new file mode 100644 index 00000000000..3ee8f3ea467 --- /dev/null +++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml new file mode 100755 index 00000000000..1f5e66ff641 --- /dev/null +++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.eclipse.papyrus.main.tests.cdo.target.parent + org.eclipse.papyrus + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.main.tests.cdo.eclipse.target + eclipse-target-definition + diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/pom.xml b/releng/tests/main-tests-with-cdo/targetPlatform/pom.xml new file mode 100755 index 00000000000..ba9eeaf9fea --- /dev/null +++ b/releng/tests/main-tests-with-cdo/targetPlatform/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + + org.eclipse.papyrus.tests.cdo.releng + org.eclipse.papyrus + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.main.tests.cdo.target.parent + pom + + + + portable + + true + + + portable + + + + eclipse + + + target.suffix + eclipse + + + + eclipse + + + + + + diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target new file mode 100644 index 00000000000..de29ed2b9f8 --- /dev/null +++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd new file mode 100755 index 00000000000..8abf4881d5d --- /dev/null +++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd @@ -0,0 +1,20 @@ +target "Papyrus CDO Tests" with source requirements + +include "../../../main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd" + + +/*** Updates from the Simrel repository ***/ + +//updateFrom("EMF CDO",0) + +location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20180613-0111" { + org.eclipse.emf.cdo.admin lazy + org.eclipse.emf.cdo.dawn lazy + org.eclipse.emf.cdo.dawn.gmf lazy + org.eclipse.emf.cdo.ecore lazy + org.eclipse.emf.cdo.explorer lazy + org.eclipse.emf.cdo.explorer.ui lazy + org.eclipse.emf.cdo.gmf.notation lazy + org.eclipse.emf.cdo.server.ocl lazy + org.eclipse.emf.cdo.ui.admin lazy +} \ No newline at end of file diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml b/releng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml new file mode 100755 index 00000000000..4b386f3667e --- /dev/null +++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.eclipse.papyrus + org.eclipse.papyrus.main.tests.cdo.target.parent + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.main.tests.cdo.portable.target + eclipse-target-definition + diff --git a/releng/tests/main-tests/pom.xml b/releng/tests/main-tests/pom.xml new file mode 100644 index 00000000000..26e68ca2813 --- /dev/null +++ b/releng/tests/main-tests/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + org.eclipse.papyrus + org.eclipse.papyrus.tests.releng + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.tests.main.releng + 1.2.0-SNAPSHOT + pom + + + targetPlatform + + + diff --git a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target new file mode 100644 index 00000000000..3e859297a2c --- /dev/null +++ b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/tests/main-tests/targetPlatform/eclipse/pom.xml b/releng/tests/main-tests/targetPlatform/eclipse/pom.xml new file mode 100644 index 00000000000..ba9327703dd --- /dev/null +++ b/releng/tests/main-tests/targetPlatform/eclipse/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.eclipse.papyrus.main.tests.target.parent + org.eclipse.papyrus + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.main.tests.eclipse.target + eclipse-target-definition + diff --git a/releng/tests/main-tests/targetPlatform/pom.xml b/releng/tests/main-tests/targetPlatform/pom.xml new file mode 100644 index 00000000000..9f773770e68 --- /dev/null +++ b/releng/tests/main-tests/targetPlatform/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + + org.eclipse.papyrus.tests.main.releng + org.eclipse.papyrus + 1.2.0-SNAPSHOT + + + org.eclipse.papyrus.main.tests.target.parent + 0.0.1-SNAPSHOT + pom + + + + portable + + true + + + portable + + + + eclipse + + + target.suffix + eclipse + + + + eclipse + + + + + + diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target new file mode 100644 index 00000000000..76da4b1ddc2 --- /dev/null +++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd new file mode 100644 index 00000000000..0ecf3792456 --- /dev/null +++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd @@ -0,0 +1,18 @@ +target "Papyrus Tests" with source requirements + +include "../../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd" + +//manualUpdate + +location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" { + org.eclipse.gmf.codegen + org.eclipse.gmf.codegen.ui + org.eclipse.gmf.codegen.xtend + org.eclipse.gmf.codegen.xtend.ui +} + +//updateFrom("EMF COMPARE",0) + +location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201812111422/" { + org.eclipse.emf.compare.source.feature.group +} \ No newline at end of file diff --git a/releng/tests/main-tests/targetPlatform/portable/pom.xml b/releng/tests/main-tests/targetPlatform/portable/pom.xml new file mode 100644 index 00000000000..d229d7bccd1 --- /dev/null +++ b/releng/tests/main-tests/targetPlatform/portable/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.eclipse.papyrus + org.eclipse.papyrus.main.tests.target.parent + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.main.tests.portable.target + eclipse-target-definition + diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml new file mode 100755 index 00000000000..0c83c739e31 --- /dev/null +++ b/releng/tests/pom.xml @@ -0,0 +1,227 @@ + + + 4.0.0 + + org.eclipse.papyrus + org.eclipse.papyrus.all.releng + 0.0.1-SNAPSHOT + + + org.eclipse.papyrus.tests.releng + 0.0.1-SNAPSHOT + pom + + + CI_TESTS_CONFIG + org.eclipse.papyrus.tests.AllTests + 0.8.2 + + -Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100 + + + + + ../../features/papyrus-tests-features/ + + + ../../tests/junit/plugins + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-version} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + + org.eclipse.tycho + tycho-compiler-plugin + + + org.eclipse.tycho + tycho-maven-plugin + + + org.eclipse.tycho + target-platform-configuration + + + org.eclipse.tycho + tycho-p2-repository-plugin + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + false + true + true + true + + ${tycho.testArgLine} ${test.argLine} + -testConfig=${testConfig} + org.eclipse.sdk.ide + ${skipInnerTests} + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + org.eclipse.uml2 + + + org.eclipse.papyrus.* + + + + + default-prepare-agent + + prepare-agent + + + + default-report + + report + + + + + + + + + + defaultProfile + + + defaultProfile + !true + + + + + papyrus-main + p2 + ${papyrus.repo.main} + + + papyrus-toolsmiths + p2 + ${papyrus.repo.toolsmiths} + + + + + + mainTests + + + mainTests + !true + + + + org.eclipse.papyrus.main.tests.${target.suffix}.target + + + main-tests + + + + + mainTestsCDO + + + mainTestsCDO + true + + + + org.eclipse.papyrus.main.tests.cdo.${target.suffix}.target + + + ../../tests/compatibility/cdo + main-tests-with-cdo + + + + + sysml14 + p2 + https://ci.eclipse.org/papyrus/job/papyrus-sysml-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/ + + + papyrusCDO + p2 + https://ci.eclipse.org/papyrus/job/Papyrus-CDO/lastSuccessfulBuild/artifact/repository/ + + + + + + mac-tests + + + mac + + + + -Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100 + -XstartOnFirstThread + + + + + buildAll + + + buildAll + true + + + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + + + + -- cgit v1.2.3