diff --git a/operation-tools/clean_broker_node.yml b/operation-tools/clean_broker_node.yml index 0ba73d1..56c9176 100644 --- a/operation-tools/clean_broker_node.yml +++ b/operation-tools/clean_broker_node.yml @@ -16,4 +16,4 @@ tasks: - name: remove daq software shell: | - rm -rf /home/dbe/git /home/dbe/miniconda3 /home/dbe/service_scripts /home/dbe/bin + rm -rf /home/dbe/git /home/dbe/miniconda3 /home/dbe/service_scripts /home/dbe/bin /home/dbe/.condarc diff --git a/operation-tools/clean_dap_node.yml b/operation-tools/clean_dap_node.yml index bc514be..5aa78cf 100644 --- a/operation-tools/clean_dap_node.yml +++ b/operation-tools/clean_dap_node.yml @@ -14,4 +14,4 @@ tasks: - name: remove all scripts software shell: | - rm -rf /home/dbe/git /home/dbe/miniconda3 /home/dbe/service_scripts /home/dbe/bin + rm -rf /home/dbe/git /home/dbe/miniconda3 /home/dbe/service_scripts /home/dbe/bin /home/dbe/.condarc diff --git a/operation-tools/clean_receiver_daq.all.yml b/operation-tools/clean_receiver_daq.all.yml index ca57897..8eeb992 100644 --- a/operation-tools/clean_receiver_daq.all.yml +++ b/operation-tools/clean_receiver_daq.all.yml @@ -6,4 +6,4 @@ tasks: - name: remove daq software shell: | - rm -rf /home/dbe/git /home/dbe/miniconda3 /home/dbe/service_scripts /home/dbe/bin + rm -rf /home/dbe/git /home/dbe/miniconda3 /home/dbe/service_scripts /home/dbe/bin /home/dbe/.condarc diff --git a/operation-tools/install_streamvis.yml b/operation-tools/install_streamvis.yml index bf41e62..22303bb 100644 --- a/operation-tools/install_streamvis.yml +++ b/operation-tools/install_streamvis.yml @@ -3,7 +3,7 @@ become: true become_user: dbe vars: - streamvis_version: 1.11.1 + streamvis_version: 1.12.0 tasks: - name: Create service directory file: diff --git a/operation-tools/templates/sf_daq_broker.setup.sh b/operation-tools/templates/sf_daq_broker.setup.sh index 832dffb..d41031f 100644 --- a/operation-tools/templates/sf_daq_broker.setup.sh +++ b/operation-tools/templates/sf_daq_broker.setup.sh @@ -21,12 +21,15 @@ envtest=$(conda env list | grep ${CONDA_ENV_NAME}) if [ $? != 0 ]; then echo "Creating the ${CONDA_ENV_NAME} environment" - conda create -y -n ${CONDA_ENV_NAME} -c paulscherrerinstitute -c conda-forge data_api jungfrau_utils bitshuffle=0.3.5 + conda install -n base conda-libmamba-solver -y + conda config --set channel_priority disabled + conda config --set solver libmamba + conda create -y -n ${CONDA_ENV_NAME} -c paulscherrerinstitute -c conda-forge data_api jungfrau_utils conda deactivate conda activate ${CONDA_ENV_NAME} - conda install -y -c conda-forge bottle pika ujson unidecode + conda install -y -c conda-forge bottle pika ujson conda install -y -c slsdetectorgroup -c conda-forge slsdet=6.1.1 conda install -y -c paulscherrerinstitute -c conda-forge pyepics else diff --git a/operation-tools/templates/streamvis_setup.sh b/operation-tools/templates/streamvis_setup.sh index 805f3c8..767b99d 100644 --- a/operation-tools/templates/streamvis_setup.sh +++ b/operation-tools/templates/streamvis_setup.sh @@ -20,8 +20,10 @@ envtest=$(conda env list | grep vis) if [ $? != 0 ]; then echo "Creating the vis environment" + conda install -n base conda-libmamba-solver -y conda config --append channels conda-forge conda config --append channels paulscherrerinstitute - conda config --set channel_priority strict + conda config --set channel_priority disabled + conda config --set solver libmamba conda create -n vis -y streamvis={{ streamvis_version }} fi