From c65bdca6929bb4640527824d87883392e4408548 Mon Sep 17 00:00:00 2001 From: edgrif <edgrif> Date: Thu, 14 Jan 2010 14:37:54 +0000 Subject: [PATCH] switch to deskpro16113 for now. --- scripts/build_config.sh | 9 ++++++--- scripts/zmap_build_rt_release_notes.sh | 3 ++- scripts/zmap_do_build.sh | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/build_config.sh b/scripts/build_config.sh index 858216040..b64ddf0a6 100755 --- a/scripts/build_config.sh +++ b/scripts/build_config.sh @@ -91,7 +91,8 @@ function _config_source_file # no = FALSEHOOD # config for the master build script -ZMAP_MASTER_HOST=tviewsrv +#ZMAP_MASTER_HOST=tviewsrv +ZMAP_MASTER_HOST=deskpro16113 ZMAP_MASTER_BUILD_DOCS=yes ZMAP_MASTER_BUILD_DOXYGEN_DOCS=yes ZMAP_MASTER_BUILD_DIST=yes @@ -105,7 +106,8 @@ ZMAP_MASTER_NOTIFY_MAIL=zmapdev@sanger.ac.uk ZMAP_MASTER_BUILD_CANVAS_DIST=no ZMAP_CLUSTER_CONFIG_FILE=~zmap/cluster.config.sh -ZMAP_BUILD_MACHINES="tviewsrv mac18480i cbi4" +#ZMAP_BUILD_MACHINES="tviewsrv mac18480i cbi4" +ZMAP_BUILD_MACHINES="deskpro16113 mac18480i cbi4" ZMAP_SSH_OPTIONS="-oStrictHostKeyChecking=no \ -oConnectTimeout=3 \ -oSetupTimeOut=3 \ @@ -152,7 +154,8 @@ ZMAP_WEBSITE_SINGLE_FILES="src/zmapServer/acedb/models.wrm:user_doc/models.wrm.s WEBROOT=/nfs/WWWdev/SANGER_docs/htdocs WEBUSER=zmap # Should be the machine where /nfs/WWWdev is exported! -WEBHOST=tviewsrv +#WEBHOST=tviewsrv +WEBHOST=deskpro16113 ZMAP_WEBSITE_TARGET=$WEBROOT/Software/analysis/ZMap # bootstrap (autotools locations) diff --git a/scripts/zmap_build_rt_release_notes.sh b/scripts/zmap_build_rt_release_notes.sh index 42eb88bf8..8e78de9d0 100755 --- a/scripts/zmap_build_rt_release_notes.sh +++ b/scripts/zmap_build_rt_release_notes.sh @@ -218,7 +218,8 @@ $NO_RELEASE_B EOF # Can no longer run on scratchy.. rt is now installed in /software/acedb/bin for i386 -RTSERVER=tviewsrv +#RTSERVER=tviewsrv +RTSERVER=deskpro16113 RTHTTPSERVER="https://rt.sanger.ac.uk" RTUSER=zmap RTRESULTS=rt_tickets.out diff --git a/scripts/zmap_do_build.sh b/scripts/zmap_do_build.sh index 30a98effe..e71644dd1 100755 --- a/scripts/zmap_do_build.sh +++ b/scripts/zmap_do_build.sh @@ -9,7 +9,8 @@ # Configuring variables # ================== CONFIG ================== -SRC_MACHINE=tviewsrv +#SRC_MACHINE=tviewsrv +SRC_MACHINE=deskpro16113 CVS_CHECKOUT_SCRIPT=./build_bootstrap.sh GLOBAL_LOG=~/BUILDS/latest.build.log ERROR_RECIPIENT=zmapdev@sanger.ac.uk -- GitLab