[582977] Exploit direct promotion of job's target platform
diff --git a/releng/org.eclipse.qvto.releng.build-site/justj-promoter.properties b/releng/org.eclipse.qvto.releng.build-site/justj-promoter.properties
index 6e08dc4..fc9eafa 100644
--- a/releng/org.eclipse.qvto.releng.build-site/justj-promoter.properties
+++ b/releng/org.eclipse.qvto.releng.build-site/justj-promoter.properties
@@ -13,20 +13,10 @@
###############################################################################
# QVTo publisher properties for use by the justj-promoter job:
#
-# Since JustJ cannot accept an https promote specification
-# the source job must wrap up the P2 repo using an execute step post-Maven
-#
-# cd releng/org.eclipse.qvto.releng.build-site/target/repository
-# zip -qr ../../../../p2repo.zip .
-#
-# the promoter unwraps the P2 repo using an execute step pre-Maven
-#
-# curl -s -k ${BUILD_PROMOTE} > p2repo.zip
-# unzip -q p2repo.zip -d p2repo
-#
BUILD_COMMIT=-commit https://git.eclipse.org/c/mmt/org.eclipse.qvto.git/commit/?id=${env.GIT_COMMIT}
-BUILD_PROMOTE=${env.BUILD_URL}artifact/p2repo.zip
+BUILD_PROMOTE=${env.BUILD_URL}artifact/targetPlatform
BUILD_REMOTE=-remote genie.qvt-oml@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/mmt/qvto
BUILD_ROOT=/home/jenkins/agent/workspace/justj-promoter/justj-sync
BUILD_TIMESTAMP=-timestamp ${buildTimestamp}
BUILD_TYPE=${env.BUILD_TYPE}
+BUILD_URL=${env.BUILD_URL}
diff --git a/releng/org.eclipse.qvto.releng.promote/pom.xml b/releng/org.eclipse.qvto.releng.promote/pom.xml
index 3bc7a98..f85dff8 100644
--- a/releng/org.eclipse.qvto.releng.promote/pom.xml
+++ b/releng/org.eclipse.qvto.releng.promote/pom.xml
@@ -22,18 +22,17 @@
The "JustJ for QVTo" Eclipse launch supports regular Java debugging."
-->
<BUILD_COMMIT>-commit https://git.eclipse.org/c/mmt/org.eclipse.qvto.git/commit/?id=${env.GIT_COMMIT}</BUILD_COMMIT>
- <BUILD_PROMOTE>${org.eclipse.justj.p2.manager.build.url}</BUILD_PROMOTE>
+ <BUILD_PROMOTE>https://ci.eclipse.org/qvto/job/qvto-master/lastSuccessfulBuild/artifact/targetPlatform</BUILD_PROMOTE>
<BUILD_REMOTE>-remote genie.qvt-oml@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/mmt/qvto</BUILD_REMOTE>
<BUILD_ROOT>${project.build.directory}/justj-sync</BUILD_ROOT>
<BUILD_TIMESTAMP>-timestamp ${build.timestamp}</BUILD_TIMESTAMP>
<BUILD_TYPE>${build.type}</BUILD_TYPE>
-
+ <BUILD_URL>https://ci.eclipse.org/qvto/job/qvto-master/lastSuccessfulBuild/</BUILD_URL>
<eclipse.repo>https://download.eclipse.org/releases/latest</eclipse.repo>
<justj.tools.repo>https://download.eclipse.org/justj/tools/updates/nightly/latest</justj.tools.repo>
<org.eclipse.justj.p2.manager.args></org.eclipse.justj.p2.manager.args>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
- <org.eclipse.justj.p2.manager.build.url>${BUILD_URL}</org.eclipse.justj.p2.manager.build.url>
</properties>
<build>
diff --git a/releng/org.eclipse.qvto.releng.tycho/.launches/JustJ for QVTo.launch b/releng/org.eclipse.qvto.releng.tycho/.launches/JustJ for QVTo.launch
index 1d4ead4..d4d11a6 100644
--- a/releng/org.eclipse.qvto.releng.tycho/.launches/JustJ for QVTo.launch
+++ b/releng/org.eclipse.qvto.releng.tycho/.launches/JustJ for QVTo.launch
@@ -19,7 +19,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -retain 50 -label QVTo -build-url https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7/ -root C:/Temp/qvto-sync -relative builds -version-iu-pattern org\.eclipse\.m2m\.qvt\.oml\.sdk\.feature.* -primary-iu-filter-pattern org\.eclipse\.m2m\.qvt\.oml\.sdk\.feature.*|org\.eclipse\.m2m\.qvt\.oml\.tools\.feature.* -target-url https://download.eclipse.org/mmt/qvto -promote E:\GIT\org.eclipse.qvto\releng\org.eclipse.qvto.releng.promote/../org.eclipse.qvto.releng.build-site/target/repository -type milestone -breadcrumb QVTo https://projects.eclipse.org/projects/modeling.mmt.qvt-oml/downloads -archive "P2 repos https://archive.eclipse.org/mmt/qvto/updates/releases" -archive "zips/drops https://archive.eclipse.org/mmt/qvto/downloads/drops""/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -retain 50 -label QVTo -build-url "https://ci.eclipse.org/qvt-oml/job/qvto-master/lastSuccessfulBuild/artifact/targetPlatform and https://ci.eclipse.org/qvt-oml/job/justj-promoter/40/" -root C:/Temp/qvto-sync -relative builds -version-iu-pattern org\.eclipse\.m2m\.qvt\.oml\.sdk\.feature.* -primary-iu-filter-pattern org\.eclipse\.m2m\.qvt\.oml\.sdk\.feature.*|org\.eclipse\.m2m\.qvt\.oml\.tools\.feature.* -target-url https://download.eclipse.org/mmt/qvto -promote E:\GIT\org.eclipse.qvto\releng\org.eclipse.qvto.releng.promote/../org.eclipse.qvto.releng.build-site/target/repository -type milestone -breadcrumb QVTo https://projects.eclipse.org/projects/modeling.mmt.qvt-oml/downloads -archive "P2 repos https://archive.eclipse.org/mmt/qvto/updates/releases" -archive "zips/drops https://archive.eclipse.org/mmt/qvto/downloads/drops""/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true"/>
<stringAttribute key="pde.version" value="3.3"/>
