From 1dc6672efb4eb03dd3174f268cca18a78ccfbe09 Mon Sep 17 00:00:00 2001 From: Simon Wells Date: Fri, 24 Feb 2012 16:39:19 +0000 Subject: [PATCH 1/3] updated OMERO-trunk hudson url for build artifacts --- docs/install/VM/README.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/install/VM/README.txt b/docs/install/VM/README.txt index f3283ca7269..bc1e27e79bc 100644 --- a/docs/install/VM/README.txt +++ b/docs/install/VM/README.txt @@ -29,8 +29,8 @@ The purpose of these scripts is to automate the process of building an OMERO vir DL_LOC stores the URL from which to retrieve our build: DL_LOC="http://url-of-your-download-folder" e.g. - DL_LOC="http://hudson.openmicroscopy.org.uk/job/OMERO-trunk-qa-builds/lastSuccessfulBuild/artifact/" - + DL_LOC="http://hudson.openmicroscopy.org.uk/job/OMERO-trunk/lastSuccessfulBuild/artifact/" + DL_ARCHIVE stores the name of the zip archive to retrieve from DL_LOC because the build process could deploy many archives to that location and we must specify the particular one that we want to retrieve. DL_ARCHIVE="omero.server.archive.zip" e.g. From 476e4f0c5d5ae24c5b0836f282e21cecd92cc3b1 Mon Sep 17 00:00:00 2001 From: Simon Wells Date: Fri, 24 Feb 2012 16:48:03 +0000 Subject: [PATCH 2/3] Updated release version number to 4.3.4 --- docs/install/VM/setup_omero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/VM/setup_omero.sh b/docs/install/VM/setup_omero.sh index a6fb3531ae6..aa2f393ac63 100644 --- a/docs/install/VM/setup_omero.sh +++ b/docs/install/VM/setup_omero.sh @@ -5,7 +5,7 @@ set -e -u -x PGPASSWORD=${PGPASSWORD:-"omero"} TARGET=${TARGET:-"QA"} # NB. Valid args are {QA | RELEASE} URL_RELEASE="http://cvs.openmicroscopy.org.uk/snapshots/omero/" -RELEASE_ARCHIVE="OMERO.server-Beta-4.3.1.zip" +RELEASE_ARCHIVE="OMERO.server-Beta-4.3.4.zip" RELEASE_FOLDER=${RELEASE_ARCHIVE%.zip} DB_VERSION="OMERO4.3" DB_REVISION="0" From 201f72eb6fe9f0c344ad8d1f28a12f64b1fa5530 Mon Sep 17 00:00:00 2001 From: Simon Wells Date: Fri, 24 Feb 2012 16:52:02 +0000 Subject: [PATCH 3/3] Use OMERO-trunk instead of OMERO-trunk-qa-builds --- docs/install/VM/setup_omero.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/install/VM/setup_omero.sh b/docs/install/VM/setup_omero.sh index aa2f393ac63..5692850a839 100644 --- a/docs/install/VM/setup_omero.sh +++ b/docs/install/VM/setup_omero.sh @@ -23,15 +23,15 @@ else DL_ARCHIVE="" if [ "x$DL_ARCHIVE" == "x" ]; then - URL=`wget -q -O- "http://hudson.openmicroscopy.org.uk/job/OMERO-trunk-qa-builds/lastSuccessfulBuild/api/xml?xpath=/freeStyleBuild/url/text()"` - FILE=`wget -q -O- "http://hudson.openmicroscopy.org.uk/job/OMERO-trunk-qa-builds/lastSuccessfulBuild/api/xml?xpath=//relativePath[contains(.,'server')]/text()"` + URL=`wget -q -O- "http://hudson.openmicroscopy.org.uk/job/OMERO-trunk/lastSuccessfulBuild/api/xml?xpath=/freeStyleBuild/url/text()"` + FILE=`wget -q -O- "http://hudson.openmicroscopy.org.uk/job/OMERO-trunk/lastSuccessfulBuild/api/xml?xpath=//relativePath[contains(.,'server')]/text()"` wget -q "$URL"artifact/$FILE DL_ARCHIVE=$FILE DL_FOLDER=${DL_ARCHIVE%.zip} else - DL_LOC="http://hudson.openmicroscopy.org.uk/job/OMERO-trunk-qa-builds/lastSuccessfulBuild/artifact/" + DL_LOC="http://hudson.openmicroscopy.org.uk/job/OMERO-trunk/lastSuccessfulBuild/artifact/" DL_FOLDER=${DL_ARCHIVE%.zip} wget $DL_LOC$DL_ARCHIVE