From: Jason Etheridge Date: Wed, 9 Oct 2013 18:42:01 +0000 (-0400) Subject: experiment with a master-derived topic branch X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=698d6f18b24e7cf5363b5007aabb789371a9cdc7;p=working%2Frandom.git experiment with a master-derived topic branch Signed-off-by: Jason Etheridge --- diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh index 0621f6e7c..e60a80178 100755 --- a/installer/wheezy/eg_wheezy_installer.sh +++ b/installer/wheezy/eg_wheezy_installer.sh @@ -118,8 +118,8 @@ OPENSRF_REPO='git://git.evergreen-ils.org/OpenSRF.git' OPENSRF_BRANCH='master' #EVERGREEN_REPO='git://git.evergreen-ils.org/working/Evergreen.git' #EVERGREEN_BRANCH='collab/phasefx/qa-integration' -EVERGREEN_REPO='git://git.evergreen-ils.org/Evergreen.git' -EVERGREEN_BRANCH='master' +EVERGREEN_REPO='git://git.evergreen-ils.org/working/Evergreen.git' +EVERGREEN_BRANCH='collab/phasefx/prereq-fallback-for-Net-Z3950-SimpleServer' OSRF_COMMAND=" cd /home/opensrf; git clone --depth 0 --branch $OPENSRF_BRANCH $OPENSRF_REPO OpenSRF; diff --git a/qa/test.sh b/qa/test.sh index 19cf2d7e7..cee0da701 100755 --- a/qa/test.sh +++ b/qa/test.sh @@ -1,6 +1,6 @@ #!/bin/bash export TARGET_USER=evergreen -export TARGET_HOST=192.168.71.51 +export TARGET_HOST=192.168.71.64 export TARGET_PATH=/home/evergreen/ export LOCAL_QA_GIT_PATH=/home/opensrf/git/random/ export LOCAL_QA_BRANCH=collab/phasefx/wheezy_installer