From 06b76300dd234e8c4f3617afbcde6754f6e17513 Mon Sep 17 00:00:00 2001
From: Arnaud Dieumegard <arnaud.dieumegard@obeo.fr>
Date: Thu, 25 Jun 2020 11:30:26 +0200
Subject: [PATCH] [releng] Update TP for 1.4.1.IT5 and Fix Jenkinsfile

- Update TP
- Update JEnkinsfile to remove clean of entire nightly folder

Change-Id: I5f399997191b819d53a46d7b4c1a43b97c21ab1a
Signed-off-by: Arnaud Dieumegard <arnaud.dieumegard@obeo.fr>
---
 Jenkinsfile                                                   | 3 +--
 .../org.polarsys.kitalpha.releng.targets/kitalpha.target      | 4 ++--
 .../kitalpha.targetplatform                                   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 25243f4768..4484dcaba6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,7 +23,6 @@ pipeline {
 						echo "deploy update sites"
 						DEST_DIR=/home/data/httpd/download.eclipse.org/kitalpha/updates/nightly
 						VERSION=1.4.x
-						ssh genie.kitalpha@projects-storage.eclipse.org rm -rf ${DEST_DIR}
 						ssh genie.kitalpha@projects-storage.eclipse.org rm -rf ${DEST_DIR}/component/${VERSION}
 						ssh genie.kitalpha@projects-storage.eclipse.org rm -rf ${DEST_DIR}/runtime/${VERSION}
 						ssh genie.kitalpha@projects-storage.eclipse.org rm -rf ${DEST_DIR}/runtimecore/${VERSION}
@@ -38,7 +37,7 @@ pipeline {
 						scp -r releng/plugins/org.polarsys.kitalpha.releng.samplecomponent.updatesite/target/repository/* genie.kitalpha@projects-storage.eclipse.org:${DEST_DIR}/component/${VERSION}
 						scp -r releng/plugins/org.polarsys.kitalpha.releng.runtime.updatesite/target/repository/* genie.kitalpha@projects-storage.eclipse.org:${DEST_DIR}/runtime/${VERSION}
 						scp -r releng/plugins/org.polarsys.kitalpha.releng.runtime.core.updatesite/target/repository/* genie.kitalpha@projects-storage.eclipse.org:${DEST_DIR}/runtimecore/${VERSION}
-						scp -r releng/plugins/org.polarsys.kitalpha.releng.targets/* genie.kitalpha@projects-storage.eclipse.org:${DEST_DIR}/runtimecore/${VERSION}/targets
+						scp -r releng/plugins/org.polarsys.kitalpha.releng.targets/*.target* genie.kitalpha@projects-storage.eclipse.org:${DEST_DIR}/runtimecore/${VERSION}/targets
 						scp -r releng/plugins/org.polarsys.kitalpha.releng.sdk.updatesite/target/repository/* genie.kitalpha@projects-storage.eclipse.org:${DEST_DIR}/sdk/${VERSION}
 						
 						echo "deploy product"
diff --git a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.target b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.target
index a55ccf9bc6..d159105e4b 100644
--- a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.target
+++ b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="kitapha" sequenceNumber="1584984246">
+<target name="kitapha" sequenceNumber="1593076391">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
@@ -104,7 +104,7 @@
       <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/stable/6.3.1-S20200602-082939/2019-06/"/>
+      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/milestones/6.3.2rc1/2019-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.doc" version="0.0.0"/>
diff --git a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform
index 0ebe853997..097cc31799 100644
--- a/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform
+++ b/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform
@@ -83,7 +83,7 @@ location GMF-Runtime-1.13.0 "https://download.eclipse.org/modeling/gmp/gmf-runti
     org.eclipse.gmf.runtime.thirdparty.feature.group lazy
 }
 
-location sirius "https://download.eclipse.org/sirius/updates/stable/6.3.1-S20200602-082939/2019-06/" {
+location sirius "https://download.eclipse.org/sirius/updates/milestones/6.3.2rc1/2019-06/" {
 	org.eclipse.sirius.doc.feature.feature.group lazy
     org.eclipse.sirius.runtime.source.feature.group lazy
     org.eclipse.sirius.runtime.acceleo.feature.group lazy