Bug 518452 - [releng] [photon] Update scripts, site and targets

Change-Id: I0b5aec247e74ef66089d71eb52c0b04fe0da4019
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

5 files changed, 23 insertions, 30 deletions

diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index 85b4f376cc7..bbf91010ac4 100644
--- a/releng/main/site/category.xml
+++ b/releng/main/site/category.xml
@@ -25,7 +25,5 @@
          Papyrus User Examples offers a set of plugins dedicated to gather examples of Papyrus usage.
       </description>
    </category-def>
-
-   <repository-reference location="http://download.eclipse.org/releases/oxygen/" enabled="true" />
 </site>
 
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index d7c7bfe95c0..98a914ed8d2 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -118,36 +118,22 @@ location nebula "http://download.eclipse.org/nebula/releases/1.2.0/" {
 
 location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
 	org.eclipse.nebula.widgets.nattable.core.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
 	org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group
 	org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group
-	org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group
 }
 
 //manualUpdate (Needed by infra.tools, API Evolution Report generation and other plugins)
 
 location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository/" {
 	com.google.guava 21.0.0
-	com.google.guava.source 21.0.0
 	com.google.gson [2.7.0,2.8.0)
-	com.google.gson.source [2.7.0,2.8.0)
 	org.apache.commons.lang3 3.1.0
-	org.apache.commons.lang3.source 3.1.0
 	org.apache.batik.anim [1.9.1,2.0.0)
-	org.apache.batik.anim.source [1.9.1,2.0.0)
 	org.apache.batik.dom [1.9.1,2.0.0)
-	org.apache.batik.dom.source [1.9.1,2.0.0)
 	org.apache.batik.dom.svg [1.9.1,2.0.0)
-	org.apache.batik.dom.svg.source [1.9.1,2.0.0)
 	org.apache.batik.xml [1.9.1,2.0.0)
-	org.apache.batik.xml.source [1.9.1,2.0.0)
 	org.apache.batik.util [1.9.1,2.0.0)
-	org.apache.batik.util.source [1.9.1,2.0.0)
 	org.apache.batik.svggen [1.9.1,2.0.0)
-	org.apache.batik.svggen.source [1.9.1,2.0.0)
 	org.apache.batik.ext [1.9.1,2.0.0)
-	org.apache.batik.ext.source [1.9.1,2.0.0)
 	org.objectweb.asm [5.0.1, 6.0.0)
-	org.objectweb.asm.source [5.0.1, 6.0.0)
 }
\ No newline at end of file
diff --git a/releng/toolkit/server/build-after-toolsmiths.sh b/releng/toolkit/server/build-after-toolsmiths.sh
index dffb9a3f89f..2ed9c7e985e 100644
--- a/releng/toolkit/server/build-after-toolsmiths.sh
+++ b/releng/toolkit/server/build-after-toolsmiths.sh
@@ -42,14 +42,16 @@ fi
 zipName="Papyrus-Toolsmiths.zip"
 
 rm -rf tmp
-mkdir -p "tmp/$FULL_BUILD_ID"
+#mkdir -p "tmp/$FULL_BUILD_ID"
+mkdir -p "tmp/toolsmiths"
 
 rm -rf $updateSite
 mv $p2UpdateSiteDir $updateSite
 
 # create the update site zip
 (cd $updateSite && zip -r $updateZipName *)
-mv $updateSite/$updateZipName "tmp/$FULL_BUILD_ID"
+#mv $updateSite/$updateZipName "tmp/$FULL_BUILD_ID"
+mv $updateSite/$updateZipName "tmp/toolsmiths"
 
 (cd tmp && zip -r $zipName *)
 mv tmp/$zipName .
diff --git a/releng/toolkit/server/build-after.sh b/releng/toolkit/server/build-after.sh
index ca5e9dd2aba..e5e244f3f4e 100644
--- a/releng/toolkit/server/build-after.sh
+++ b/releng/toolkit/server/build-after.sh
@@ -33,7 +33,8 @@ fi
 
 #COMPACT_BUILD_ID="${BUILD_ID//[-_]}"
 #COMPACT_BUILD_ID="${COMPACT_BUILD_ID:0:12}"
-COMPACT_BUILD_ID="$(date +%Y%m%d%H%M)"
+#COMPACT_BUILD_ID="$(date +%Y%m%d%H%M)"
+COMPACT_BUILD_ID="$BUILD_TIMESTAMP"
 FULL_BUILD_ID=${buildType}${COMPACT_BUILD_ID}
 
 if [ -n "$BUILD_ALIAS" ]; then
diff --git a/releng/toolkit/server/manualPromote-master.sh b/releng/toolkit/server/manualPromote-master.sh
index 89b3e0d6a52..4be82907a71 100644
--- a/releng/toolkit/server/manualPromote-master.sh
+++ b/releng/toolkit/server/manualPromote-master.sh
@@ -153,17 +153,23 @@ $ADD_DOWNLOAD_STATS "$updateSiteDir/main" "main"
 
 # ============================== PUBLISH TOOLSMITHS ==============================
 if [[ "$toolsmithsBuildNumber" != "0" ]]; then
-        nfsURL="" ## Not supported for HIPP builds. Leave the variable since the promote functions are still shared with the Shared Hudson Instance builds
-        hudsonURL="https://hudson.eclipse.org/papyrus/job/Papyrus-Photon-Toolsmiths/$toolsmithsBuildNumber/artifact/"
-        zipName="Papyrus-Toolsmiths.zip"
-        updateZipName="Papyrus-Toolsmiths-Update.zip"
-        getZip "$zipName" "$nfsURL" "$hudsonURL"
-        
-        # unzips under a "toolsmiths" folder under the main build's folder
-        unzip -o "$zipName" -d "$buildsDir/$folderName"
-        unzip -o "$buildsDir/$folderName/toolsmiths/$updateZipName" -d "$updateSiteDir/toolsmiths"
-
-        $ADD_DOWNLOAD_STATS "$updateSiteDir/toolsmiths" "toolsmiths"
+    nfsURL="" ## Not supported for HIPP builds. Leave the variable since the promote functions are still shared with the Shared Hudson Instance builds
+    hudsonURL="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Toolsmiths/$toolsmithsBuildNumber/artifact/"
+    zipName="Papyrus-Toolsmiths.zip"
+    updateZipPrefix="Papyrus-Toolsmiths"
+    getZip "$zipName" "$nfsURL" "$hudsonURL"
+
+    echo "publishing toolsmiths (version='$version') to the builds directory '$buildsDir'..."
+    unzip -o "$zipName" -d "$buildsDir/$folderName"
+
+    foldersInZip=$(unzip -t "$zipName" | egrep "testing: *[^/]*/ +OK" | sed 's%^ *testing: *\([^/]*\)/ *OK$%\1%')
+    [ $(echo "$foldersInZip" | wc -l) == 1 ] || { echo "one directory expected in zip"; exit 1; }
+    folderNameToolsmith="$foldersInZip"
+
+    updateSiteZipName=$(basename $(ls -1 "$buildsDir/$folderName/$folderNameToolsmith/${updateZipPrefix}"*.zip))
+    unzip -o "$buildsDir/$folderName/$folderNameToolsmith/$updateSiteZipName" -d "$updateSiteDir/toolsmiths"
+
+    #$ADD_DOWNLOAD_STATS "$updateSiteDir/toolsmiths" "toolsmiths"
 fi
 
 # ============================== PUBLISH TESTS ==============================