diff --git a/deployment/autodeploy_versions b/deployment/autodeploy_versions index 2dac2c3..44c018c 100644 --- a/deployment/autodeploy_versions +++ b/deployment/autodeploy_versions @@ -4,7 +4,7 @@ # The version can be a git tag, branch or commit hash. # BEC version to use -BEC_AUTODEPLOY_VERSION="cli_launch" +BEC_AUTODEPLOY_VERSION="master" # ophyd_devices version to use OPHYD_DEVICES_AUTODEPLOY_VERSION="master" diff --git a/deployment/bec-server-config.yaml b/deployment/bec-server-config.yaml new file mode 100644 index 0000000..6484ecb --- /dev/null +++ b/deployment/bec-server-config.yaml @@ -0,0 +1,18 @@ +redis: + host: localhost + port: 6379 +mongodb: + host: localhost + port: 27017 +scibec: + host: http://[::1] + port: 3030 + beamline: "CSAXS" +service_config: + general: + reset_queue_on_cancel: True + enforce_ACLs: False + file_writer: + plugin: default_NeXus_format + base_path: ./ + diff --git a/deployment/deploy.sh b/deployment/deploy.sh index 77f1a64..6591502 100755 --- a/deployment/deploy.sh +++ b/deployment/deploy.sh @@ -1,18 +1,22 @@ # deployment script to be translated to Ansible -BEAMLINE_REPO=gitlab.psi.ch:bec/csaxs-bec.git + +# NOT NEEDED since the beamline repo will be autodeployed +# BEAMLINE_REPO=gitlab.psi.ch:bec/csaxs-bec.git +# git clone git@$BEAMLINE_REPO + +module add psi-python38/2020.11 # start redis -# docker run --network=host --name redis-bec -d redis +docker run --network=host --name redis-bec -d redis # alternative: -# conda install redis; redis-server & +# conda install -y redis; redis-server & -git clone git@$BEAMLINE_REPO # get the target versions for ophyd_devices and BEC source ./csaxs-bec/deployment/autodeploy_versions -git clone -b $OPHYD_DEVICES_AUTODEPLOY_VERSION git@gitlab.psi.ch:bec/ophyd_devices.git -git clone -b $BEC_AUTODEPLOY_VERSION git@gitlab.psi.ch:bec/bec.git +git clone -b $OPHYD_DEVICES_AUTODEPLOY_VERSION https://gitlab.psi.ch/bec/ophyd_devices.git +git clone -b $BEC_AUTODEPLOY_VERSION https://gitlab.psi.ch/bec/bec.git # install BEC cd bec