[releng] ci-staging to ci migration
diff --git a/releng/org.eclipse.qvto.releng.build-site/downloads.sh b/releng/org.eclipse.qvto.releng.build-site/downloads.sh
index 8c14e63..346e1cd 100644
--- a/releng/org.eclipse.qvto.releng.build-site/downloads.sh
+++ b/releng/org.eclipse.qvto.releng.build-site/downloads.sh
@@ -10,14 +10,13 @@
# E.D.Willink - initial API and implementation
#*******************************************************************************
#
-# Promote the PUBLISH__URL to the downloads 'page'.
+# Promote ~/publish.zip to the downloads 'page'.
+# Promote ~/javadoc.zip to the downloads 'page'.
#
-# -u PUBLISH__URL The zip to be published e.g. https://ci.eclipse.org/qvt-oml/job/qvto-master/25/artifact/releng/org.eclipse.qvto.releng.build-site/target/org.eclipse.qvto-3.9.0.v20171025-1600.zip
# -v PUBLISH__VERSION Unqualified version e.g. 3.9.0
# -t PUBLISH__BUILD_T Build type N/I/S/R, blank suppresses promotion
# -q PUBLISH__QUALIFIER Version qualifier e.g. v20171025-1600
# -a PUBLISH__ALIAS Non blank to use alias as part of final name
-# -j PUBLISH__JAVADOC The optional Javadoc zip to be published e.g. https://ci.eclipse.org/qvt-oml/job/qvto-master/25/artifact/releng/org.eclipse.qvto.releng.build-site/target/QVTo-javadoc.zip
#
dropsFolder="/home/data/httpd/download.eclipse.org/mmt/qvto/downloads/drops/"
javadocFolder="/home/data/httpd/download.eclipse.org/mmt/qvto/javadoc/m2m.qvt.oml/"
@@ -25,16 +24,14 @@
zipPrefix="mmt-qvto-Update-"
localZip="newJavadoc.zip"
-while getopts u:v:t:q:a:j: option
+while getopts v:t:q:a: option
do
case "${option}"
in
-u) PUBLISH__URL=${OPTARG};;
v) PUBLISH__VERSION=${OPTARG};;
t) PUBLISH__BUILD_T=${OPTARG};;
q) PUBLISH__QUALIFIER=${OPTARG};;
a) PUBLISH__ALIAS=${OPTARG};;
-j) PUBLISH__JAVADOC=${OPTARG};;
esac
done
@@ -56,7 +53,7 @@
zipFile="${zipPrefix}${fileStem}.zip"
pushd ${versionFolder}
- curl -s -k ${PUBLISH__URL} > ${zipFile}
+ cp ~/publish.zip ${zipFile}
md5sum -b ${zipFile} > ${zipFile}.md5
sha512sum -b ${zipFile} > ${zipFile}.sha1
# make sure permissions are for the intended group
@@ -69,7 +66,7 @@
mkdir ${javadocFolder}
fi
pushd ${javadocFolder}
- curl -s -k ${PUBLISH__JAVADOC} > ${localZip}
+ cp ~/javadoc.zip > ${localZip}
if [ $? -eq 0 ]
then
javadocSize=$(wc -c <"$localZip")
diff --git a/releng/org.eclipse.qvto.releng.build-site/pom.xml b/releng/org.eclipse.qvto.releng.build-site/pom.xml
index 6c3a0cd..c2b6487 100644
--- a/releng/org.eclipse.qvto.releng.build-site/pom.xml
+++ b/releng/org.eclipse.qvto.releng.build-site/pom.xml
@@ -27,6 +27,7 @@
<includes>
<include>downloads.sh</include>
<include>index.html</include>
+ <include>publish.sh</include>
<include>updates.sh</include>
</includes>
</resource>
diff --git a/releng/org.eclipse.qvto.releng.build-site/publish.sh b/releng/org.eclipse.qvto.releng.build-site/publish.sh
new file mode 100644
index 0000000..98ca14d
--- /dev/null
+++ b/releng/org.eclipse.qvto.releng.build-site/publish.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -xv
+#*******************************************************************************
+# Copyright (c) 2019 Willink Transformations and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#
+# Contributors:
+# E.D.Willink - initial API and implementation
+#*******************************************************************************
+# Local QVTo publish script for use by the promoter job. It prepares and invokes remote scripts.
+#
+rm -f downloads.sh javadoc.zip publish.zip updates.sh
+curl -s -k ${PUBLISH__DOWNLOADS_SH} > downloads.sh
+curl -s -k ${PUBLISH__JAVADOC} > javadoc.zip
+curl -s -k ${PUBLISH__UPDATES_SH} > updates.sh
+curl -s -k ${PUBLISH__URL} > publish.zip
+ssh genie.qvt-oml@projects-storage.eclipse.org rm -f downloads.sh publish.zip updates.sh
+scp downloads.sh genie.qvt-oml@projects-storage.eclipse.org:downloads.sh
+scp javadoc.zip genie.qvt-oml@projects-storage.eclipse.org:javadoc.zip
+scp publish.zip genie.qvt-oml@projects-storage.eclipse.org:publish.zip
+scp updates.sh genie.qvt-oml@projects-storage.eclipse.org:updates.sh
+ssh genie.qvt-oml@projects-storage.eclipse.org chmod +x downloads.sh updates.sh
+ssh genie.qvt-oml@projects-storage.eclipse.org bash -ex downloads.sh -v "'${PUBLISH__VERSION}'" -t "'${PUBLISH__BUILD_T}'" -q "'${PUBLISH__QUALIFIER}'" -a "'${PUBLISH__ALIAS}'"
+ssh genie.qvt-oml@projects-storage.eclipse.org bash -ex updates.sh -v "'${PUBLISH__VERSION}'" -t "'${PUBLISH__BUILD_T}'" -q "'${PUBLISH__QUALIFIER}'"
diff --git a/releng/org.eclipse.qvto.releng.build-site/publisher.properties b/releng/org.eclipse.qvto.releng.build-site/publisher.properties
index 409b2e8..94a3f98 100644
--- a/releng/org.eclipse.qvto.releng.build-site/publisher.properties
+++ b/releng/org.eclipse.qvto.releng.build-site/publisher.properties
@@ -1,20 +1,15 @@
# QVTo publisher properties for use by the promoter job:
#
-# rm -f downloads.sh updates.sh
-# curl -s ${PUBLISH__DOWNLOADS_SH} > downloads.sh
-# curl -s ${PUBLISH__UPDATES_SH} > updates.sh
-# ssh genie.qvt-oml@projects-storage.eclipse.org rm -f downloads.sh updates.sh
-# scp downloads.sh genie.qvt-oml@projects-storage.eclipse.org:downloads.sh
-# scp updates.sh genie.qvt-oml@projects-storage.eclipse.org:updates.sh
-# ssh genie.qvt-oml@projects-storage.eclipse.org chmod +x downloads.sh updates.sh
-# ssh genie.qvt-oml@projects-storage.eclipse.org bash -ex downloads.sh -u "'${PUBLISH__URL}'" -v "'${PUBLISH__VERSION}'" -t "'${PUBLISH__BUILD_T}'" -q "'${PUBLISH__QUALIFIER}'" -a "'${PUBLISH__ALIAS}'" -j "'${PUBLISH__JAVADOC}'"
-# ssh genie.qvt-oml@projects-storage.eclipse.org bash -ex updates.sh -u "'${PUBLISH__URL}'" -v "'${PUBLISH__VERSION}'" -t "'${PUBLISH__BUILD_T}'" -q "'${PUBLISH__QUALIFIER}'"
-
+# rm -f publish.sh
+# curl -s ${PUBLISH__PUBLISH_SH} > publish.sh
+# chmod +x publish.sh
+# bash -ex publish.sh
#
PUBLISH__ALIAS=${BUILD_ALIAS}
PUBLISH__BUILD_T=${buildType}
PUBLISH__DOWNLOADS_SH=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.qvto.releng.build-site/target/downloads.sh
PUBLISH__JAVADOC=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.qvto.releng.build-site/target/QVTo-javadoc.zip
+PUBLISH__PUBLISH_SH=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.qvto.releng.build-site/target/publish.sh
PUBLISH__QUALIFIER=${buildId}
PUBLISH__UPDATES_SH=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.qvto.releng.build-site/target/updates.sh
PUBLISH__URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/org.eclipse.qvto.releng.build-site/target/${project.groupId}-${unqualifiedVersion}.${buildId}.zip
diff --git a/releng/org.eclipse.qvto.releng.build-site/updates.sh b/releng/org.eclipse.qvto.releng.build-site/updates.sh
index b5fcc30..3b484e7 100644
--- a/releng/org.eclipse.qvto.releng.build-site/updates.sh
+++ b/releng/org.eclipse.qvto.releng.build-site/updates.sh
@@ -10,9 +10,8 @@
# E.D.Willink - initial API and implementation
#*******************************************************************************
#
-# Promote the PUBLISH__URL to an updates repository.
+# Promote ~/publish.zip to an updates repository.
#
-# -u PUBLISH__URL The zip to be published e.g. https://ci.eclipse.org/qvt-oml/job/qvto-master/25/artifact/releng/org.eclipse.qvto.releng.build-site/target/org.eclipse.qvto-3.9.0.v20171025-1600.zip
# -v PUBLISH__VERSION Unqualified version e.g. 3.9.0
# -t PUBLISH__BUILD_T Build type N/I/S/R, blank suppresses promotion
# -q PUBLISH__QUALIFIER Version qualifier e.g. v20171025-1600
@@ -24,11 +23,10 @@
manageComposite="/shared/common/apache-ant-latest/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml"
externalUpdatesFolder="https://download.eclipse.org/mmt/qvto/updates/"
-while getopts u:v:t:q: option
+while getopts v:t:q: option
do
case "${option}"
in
-u) PUBLISH__URL=${OPTARG};;
v) PUBLISH__VERSION=${OPTARG};;
t) PUBLISH__BUILD_T=${OPTARG};;
q) PUBLISH__QUALIFIER=${OPTARG};;
@@ -80,7 +78,7 @@
if [ "${PUBLISH__BUILD_T}" = "N" ]
then
- curl -s -k ${PUBLISH__URL} > ${localZip}
+ cp ~/publish.zip ${localZip}
unzip -ou ${localZip} -d new${PUBLISH__VERSION}
chgrp -R ${group} new${PUBLISH__VERSION}
chmod -R g+w new${PUBLISH__VERSION}
@@ -89,7 +87,7 @@
rm -rf old${PUBLISH__VERSION} ${localZip}
elif [ "${PUBLISH__BUILD_T}" = "I" ]
then
- curl -s -k ${PUBLISH__URL} > ${localZip}
+ cp ~/publish.zip ${localZip}
unzip -ou ${localZip} -d new${PUBLISH__VERSION}
chgrp -R ${group} new${PUBLISH__VERSION}
chmod -R g+w new${PUBLISH__VERSION}
@@ -106,7 +104,7 @@
mkdir ${tQualifier}
fi
- curl -s -k ${PUBLISH__URL} > ${localZip}
+ cp ~/publish.zip ${localZip}
unzip ${localZip} -d ${tQualifier}
rm ${localZip}
@@ -116,7 +114,7 @@
popd
elif [ "${PUBLISH__BUILD_T}" = "R" ]
then
- curl -s -k ${PUBLISH__URL} > ${localZip}
+ cp ~/publish.zip ${localZip}
unzip -ou ${localZip} -d new${PUBLISH__VERSION}
chgrp -R ${group} new${PUBLISH__VERSION}
chmod -R g+w new${PUBLISH__VERSION}
