linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change newserver to a link to server_date_time in deploySICS

Browse Source
This commit is contained in:
Douglas Clowes
2014-07-21 15:10:14 +10:00
parent b9f67a2562
commit 001d41a703
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/compareSICS.py
View File

@ -96,7 +96,7 @@ def load_manifest(theManifest):
right = right[len(assignment_map["DESTDIR"]):] right = right[len(assignment_map["DESTDIR"]):]
while right.startswith("/"): while right.startswith("/"):
right = right[1:] right = right[1:]
prefix = "newserver/" prefix = right.split("/", 1)[0] + "/" #"newserver/"
if right.startswith(prefix): if right.startswith(prefix):
right = right[len(prefix):] right = right[len(prefix):]
else: else:

26
site_ansto/instrument/deploySICS.sh
View File

@ -100,6 +100,7 @@ fi
SRCDIR="." SRCDIR="."
TEMPDIR=$HOME/tmp TEMPDIR=$HOME/tmp
NEWSERVER="server_$(date +%Y%m%d_%H%M)"
# We allow the instrument to be specified as either the animal name or the # We allow the instrument to be specified as either the animal name or the
# mnemonic as we have to map between the two. This is because the source # mnemonic as we have to map between the two. This is because the source
@ -187,23 +188,24 @@ fi
# remove and recreate the temporary directory # remove and recreate the temporary directory
rm -fr $TEMPDIR/$DESTDIR rm -fr $TEMPDIR/$DESTDIR
mkdir -p $TEMPDIR/$DESTDIR/newserver mkdir -p $TEMPDIR/$DESTDIR/${NEWSERVER}
FILEMAP=$TEMPDIR/$DESTDIR/newserver/FILEMAP.TXT ln -s ${NEWSERVER} $TEMPDIR/$DESTDIR/newserver
FILEMAP=$TEMPDIR/$DESTDIR/${NEWSERVER}/FILEMAP.TXT
init_file_map init_file_map
# Notify progress and intention # Notify progress and intention
echo "Deploying $INSTRUMENT to $DESTHOST:$DESTDIR" echo "Deploying $INSTRUMENT to $DESTHOST:$DESTDIR"
# Set up the commands that we will be using for the "deploy" phase # Set up the commands that we will be using for the "deploy" phase
EXTRACT_CMDS="tar vxzp -C /; touch /$DESTDIR/{DataNumber,extraconfig.tcl,newserver/config/nexus/nexus.dic,script_validator/DataNumber}" EXTRACT_CMDS="tar vxzp -C /; touch /$DESTDIR/{DataNumber,extraconfig.tcl,${NEWSERVER}/config/nexus/nexus.dic,script_validator/DataNumber}"
if [[ "$DESTHOST" = "localhost" ]] if [[ "$DESTHOST" = "localhost" ]]
then then
EXTRACT=$EXTRACT_CMDS EXTRACT=$EXTRACT_CMDS
EXTRACT_NODEPLOY=$EXTRACT_CMDS EXTRACT_NODEPLOY=$EXTRACT_CMDS
elif [[ "$TESTING" != "test" ]] elif [[ "$TESTING" != "test" ]]
then then
EXTRACT="ssh $DESTHOST $EXTRACT_CMDS; chown -R root:root /$DESTDIR/newserver; chown ${INSTRUMENT}_sics. /$DESTDIR/{DataNumber,newserver/config/nexus/nexus.dic,script_validator/{DataNumber,data}}; chown ${INSTRUMENT}. /$DESTDIR/extraconfig.tcl" EXTRACT="ssh $DESTHOST $EXTRACT_CMDS; chown -R root:root /$DESTDIR/${NEWSERVER}; chown ${INSTRUMENT}_sics. /$DESTDIR/{DataNumber,${NEWSERVER}/config/nexus/nexus.dic,script_validator/{DataNumber,data}}; chown ${INSTRUMENT}. /$DESTDIR/extraconfig.tcl"
EXTRACT_NODEPLOY="ssh $DESTHOST $EXTRACT_CMDS; chown -R root:root /$DESTDIR/newserver; chown ${INSTRUMENT}_sics. /$DESTDIR/{DataNumber,newserver/config/nexus/nexus.dic}; chown ${INSTRUMENT}. /$DESTDIR/extraconfig.tcl" EXTRACT_NODEPLOY="ssh $DESTHOST $EXTRACT_CMDS; chown -R root:root /$DESTDIR/${NEWSERVER}; chown ${INSTRUMENT}_sics. /$DESTDIR/{DataNumber,${NEWSERVER}/config/nexus/nexus.dic}; chown ${INSTRUMENT}. /$DESTDIR/extraconfig.tcl"
else else
EXTRACT="ssh $DESTHOST $EXTRACT_CMDS" EXTRACT="ssh $DESTHOST $EXTRACT_CMDS"
EXTRACT_NODEPLOY="ssh $DESTHOST $EXTRACT_CMDS" EXTRACT_NODEPLOY="ssh $DESTHOST $EXTRACT_CMDS"
@ -227,19 +229,19 @@ COMMON=$(for f in $(cat $SRCDIR/MANIFEST.TXT); do echo -n "$SRCDIR/$f "; done)
INSTSPEC=$(for f in $(cat $INSTSRC/MANIFEST.TXT); do echo -n "$INSTSRC/$f "; done) INSTSPEC=$(for f in $(cat $INSTSRC/MANIFEST.TXT); do echo -n "$INSTSRC/$f "; done)
# Create Instrument Control Server directories and copy SICS configs to the 'server' directory # Create Instrument Control Server directories and copy SICS configs to the 'server' directory
mkdir -p $TEMPDIR/$DESTDIR/{batch,newserver,log,tmp} mkdir -p $TEMPDIR/$DESTDIR/{batch,${NEWSERVER},log,tmp}
copy_server_config newserver copy_server_config ${NEWSERVER}
cp -v -a --preserve=timestamps ../SICServer $TEMPDIR/$DESTDIR/newserver >>$FILEMAP cp -v -a --preserve=timestamps ../SICServer $TEMPDIR/$DESTDIR/${NEWSERVER} >>$FILEMAP
# Create Script Validator directories # Create Script Validator directories
mkdir -p $TEMPDIR/$DESTDIR/script_validator/{data,log,tmp} mkdir -p $TEMPDIR/$DESTDIR/script_validator/{data,log,tmp}
# Create a manifest of the files installed on the IC host # Create a manifest of the files installed on the IC host
echo "Date: $(date -Iminutes)" > $TEMPDIR/$DESTDIR/newserver/DEPLOYMENT.TXT echo "Date: $(date -Iminutes)" > $TEMPDIR/$DESTDIR/${NEWSERVER}/DEPLOYMENT.TXT
echo "User: $USER" >> $TEMPDIR/$DESTDIR/newserver/DEPLOYMENT.TXT echo "User: $USER" >> $TEMPDIR/$DESTDIR/${NEWSERVER}/DEPLOYMENT.TXT
DEPLOYED_VERSION="$(bash ../extract_version.sh all)" DEPLOYED_VERSION="$(bash ../extract_version.sh all)"
echo "Version:" $DEPLOYED_VERSION >> $TEMPDIR/$DESTDIR/newserver/DEPLOYMENT.TXT echo "Version:" $DEPLOYED_VERSION >> $TEMPDIR/$DESTDIR/${NEWSERVER}/DEPLOYMENT.TXT
cat $SRCDIR/MANIFEST.TXT $SRCDIR/$INSTSRC/MANIFEST.TXT > $TEMPDIR/$DESTDIR/newserver/MANIFEST.TXT cat $SRCDIR/MANIFEST.TXT $SRCDIR/$INSTSRC/MANIFEST.TXT > $TEMPDIR/$DESTDIR/${NEWSERVER}/MANIFEST.TXT
cd $TEMPDIR cd $TEMPDIR
# remove any .svn directories # remove any .svn directories