commit 29f2e29f616694dbb34c92fe84716bc0d4906f95
author Sina Madani <sinadoom@googlemail.com> Sun May 31 14:32:47 2020 +0100
committer Sina Madani <sinadoom@googlemail.com> Sun May 31 14:32:47 2020 +0100
tree 5a8bf5269152ed70423a9db1e749ea4291c32ca0
parent c70992544829f733af5b2e5f193c84bf4ebb784e

Use interim folder for jars and javadoc

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 804f244..e264690 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,6 @@
                 sshagent (['projects-storage.eclipse.org-bot-ssh']) {
                   sh '''
                     INTERIM=/home/data/httpd/download.eclipse.org/epsilon/interim
-                    LATEST=/home/data/httpd/download.eclipse.org/epsilon/latest
                     SITEDIR="$WORKSPACE/releng/org.eclipse.epsilon.updatesite/target"
                     if [ -d "$SITEDIR" ]; then
                       ssh genie.epsilon@projects-storage.eclipse.org rm -rf $INTERIM
@@ -109,13 +108,13 @@
                     fi
                     JARSDIR="$WORKSPACE/standalone/org.eclipse.epsilon.standalone/target"
                     if [ -d "$JARSDIR" ]; then
-                      ssh genie.epsilon@projects-storage.eclipse.org "rm -rf $LATEST/jars && mkdir -p $LATEST/jars"
-                      scp "$JARSDIR"/epsilon-* genie.epsilon@projects-storage.eclipse.org:${LATEST}/jars
+                      ssh genie.epsilon@projects-storage.eclipse.org "rm -rf $INTERIM/jars && mkdir -p $INTERIM/jars"
+                      scp "$JARSDIR"/epsilon-* genie.epsilon@projects-storage.eclipse.org:${INTERIM}/jars
                     fi
                     JAVADOCDIR="$WORKSPACE/target/site/apidocs"
                     if [ -d "$JAVADOCDIR" ]; then
-                      ssh genie.epsilon@projects-storage.eclipse.org "rm -rf ${LATEST}/javadoc"
-                      scp -r "$JAVADOCDIR" genie.epsilon@projects-storage.eclipse.org:${LATEST}/javadoc
+                      ssh genie.epsilon@projects-storage.eclipse.org "rm -rf ${INTERIM}/javadoc"
+                      scp -r "$JAVADOCDIR" genie.epsilon@projects-storage.eclipse.org:${INTERIM}/javadoc
                     fi
                   '''
                 }

releng/org.eclipse.epsilon.releng/new_version_tasks.sh

diff --git a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
index 6556888..57697f0 100644
--- a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
+++ b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
@@ -17,13 +17,11 @@
 rm -rf $Downloads/$OldVersion
 
 cd $Downloads &&
-mkdir $NewVersion && mkdir updates/$NewVersion &&
-echo "Copying update site" &&
+echo "Copying interim to $NewVersion" &&
 cp -r interim updates/$NewVersion &&
 declare -a NewFolders=("jars" "javadoc");
 for folder in "${NewFolders[@]}"; do
-  echo "Copying $folder"
-  cp -r latest/$folder $NewVersion
+  mv updates/$NewVersion/$folder $NewVersion/$folder
 done
 
 ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=$NewVersion