From 5dddf383ed518838f98c8eb46c3a58b508fe8cf7 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Tue, 19 Aug 2025 14:02:55 +0200 Subject: [PATCH] Utility rename deployment_path -> timestamped_deployment_path --- tasks/main.yaml | 52 ++++++++++++++++----------------- templates/bec-server.service.j2 | 2 +- templates/bec-server.sh.j2 | 2 +- templates/bec-set-account.j2 | 2 +- templates/bec.j2 | 2 +- vars/main.yaml | 4 +-- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tasks/main.yaml b/tasks/main.yaml index 4250b8e..f108ebf 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -38,35 +38,35 @@ - name: Create a folder for BEC deployment become_user: "{{ deployment_user }}" ansible.builtin.file: - path: "{{ deployment_path }}" + path: "{{ timestamped_deployment_path }}" state: directory - name: Clone BEC repository become_user: "{{ deployment_user }}" ansible.builtin.git: repo: https://github.com/bec-project/bec.git - dest: "{{ deployment_path }}/bec" + dest: "{{ timestamped_deployment_path }}/bec" version: "{{ bec_version }}" - name: Clone Ophyd Devices repository become_user: "{{ deployment_user }}" ansible.builtin.git: repo: https://github.com/bec-project/ophyd_devices.git - dest: "{{ deployment_path }}/ophyd_devices" + dest: "{{ timestamped_deployment_path }}/ophyd_devices" version: "{{ ophyd_devices_version }}" - name: Clone BEC Widgets repository become_user: "{{ deployment_user }}" ansible.builtin.git: repo: https://github.com/bec-project/bec_widgets.git - dest: "{{ deployment_path }}/bec_widgets" + dest: "{{ timestamped_deployment_path }}/bec_widgets" version: "{{ bec_widgets_version }}" - name: Create user branches in git repositories become_user: "{{ deployment_user }}" ansible.builtin.command: cmd: git switch -c {{ user_git_branch_name }} - chdir: "{{ deployment_path }}/{{ item }}" + chdir: "{{ timestamped_deployment_path }}/{{ item }}" loop: - bec - ophyd_devices @@ -79,7 +79,7 @@ name: user.name value: "{{ git_username }}" scope: local - repo: "{{ deployment_path }}/{{ item }}" + repo: "{{ timestamped_deployment_path }}/{{ item }}" loop: - bec - ophyd_devices @@ -92,7 +92,7 @@ name: pull.rebase value: true scope: local - repo: "{{ deployment_path }}/{{ item }}" + repo: "{{ timestamped_deployment_path }}/{{ item }}" loop: - bec - ophyd_devices @@ -105,7 +105,7 @@ name: core.sharedRepository value: group scope: local - repo: "{{ deployment_path }}/{{ item }}" + repo: "{{ timestamped_deployment_path }}/{{ item }}" loop: - bec - ophyd_devices @@ -116,7 +116,7 @@ become_user: "{{ deployment_user }}" ansible.builtin.git: repo: https://oauth2:{{ lookup('env', 'BEC_PLUGIN_TOKEN') }}@gitlab.psi.ch/bec/{{ item.key }}.git - dest: "{{ deployment_path }}/{{ item.key }}" + dest: "{{ timestamped_deployment_path }}/{{ item.key }}" version: "{{ item.value or 'main' }}" loop: "{{ bec_plugins | dict2items }}" when: not ansible_check_mode @@ -125,7 +125,7 @@ become_user: "{{ deployment_user }}" ansible.builtin.command: cmd: git remote set-url origin https://gitlab.psi.ch/bec/{{ item.key }}.git - chdir: "{{ deployment_path }}/{{ item.key }}" + chdir: "{{ timestamped_deployment_path }}/{{ item.key }}" loop: "{{ bec_plugins | dict2items }}" when: not ansible_check_mode @@ -133,7 +133,7 @@ become_user: "{{ deployment_user }}" ansible.builtin.command: cmd: git switch -c {{ user_git_branch_name }} - chdir: "{{ deployment_path }}/{{ item.key }}" + chdir: "{{ timestamped_deployment_path }}/{{ item.key }}" loop: "{{ bec_plugins | dict2items }}" when: not ansible_check_mode @@ -143,7 +143,7 @@ name: user.name value: "{{ git_username }}" scope: local - repo: "{{ deployment_path }}/{{ item.key }}" + repo: "{{ timestamped_deployment_path }}/{{ item.key }}" loop: "{{ bec_plugins | dict2items }}" when: not ansible_check_mode @@ -153,7 +153,7 @@ name: pull.rebase value: true scope: local - repo: "{{ deployment_path }}/{{ item.key }}" + repo: "{{ timestamped_deployment_path }}/{{ item.key }}" loop: "{{ bec_plugins | dict2items }}" when: not ansible_check_mode @@ -163,14 +163,14 @@ name: core.sharedRepository value: group scope: local - repo: "{{ deployment_path }}/{{ item.key }}" + repo: "{{ timestamped_deployment_path }}/{{ item.key }}" loop: "{{ bec_plugins | dict2items }}" when: not ansible_check_mode - name: Install bec_lib become_user: "{{ deployment_user }}" ansible.builtin.pip: - name: "{{ deployment_path }}/bec/bec_lib" + name: "{{ timestamped_deployment_path }}/bec/bec_lib" editable: true virtualenv_command: python3.11 -m venv virtualenv: "{{ bec_venv_path }}" @@ -180,7 +180,7 @@ - name: Install bec_ipython_client become_user: "{{ deployment_user }}" ansible.builtin.pip: - name: "{{ deployment_path }}/bec/bec_ipython_client" + name: "{{ timestamped_deployment_path }}/bec/bec_ipython_client" editable: true virtualenv_command: python3.11 -m venv virtualenv: "{{ bec_venv_path }}" @@ -188,7 +188,7 @@ - name: Install ophyd_devices become_user: "{{ deployment_user }}" ansible.builtin.pip: - name: "{{ deployment_path }}/ophyd_devices" + name: "{{ timestamped_deployment_path }}/ophyd_devices" editable: true virtualenv_command: python3.11 -m venv virtualenv: "{{ bec_venv_path }}" @@ -198,7 +198,7 @@ - name: Install bec_widgets become_user: "{{ deployment_user }}" ansible.builtin.pip: - name: "{{ deployment_path }}/bec_widgets[pyside6]" + name: "{{ timestamped_deployment_path }}/bec_widgets[pyside6]" editable: true virtualenv_command: python3.11 -m venv virtualenv: "{{ bec_venv_path }}" @@ -206,7 +206,7 @@ - name: Install bec_server become_user: "{{ deployment_user }}" ansible.builtin.pip: - name: "{{ deployment_path }}/bec/bec_server" + name: "{{ timestamped_deployment_path }}/bec/bec_server" editable: true virtualenv_command: python3.11 -m venv virtualenv: "{{ bec_venv_path }}" @@ -216,7 +216,7 @@ - name: Install BEC plugins become_user: "{{ deployment_user }}" ansible.builtin.pip: - name: "{{ deployment_path }}/{{ item.key }}" + name: "{{ timestamped_deployment_path }}/{{ item.key }}" editable: true virtualenv_command: python3.11 -m venv virtualenv: "{{ bec_venv_path }}" @@ -227,14 +227,14 @@ - name: Create BEC deployment config directory become_user: "{{ deployment_user }}" ansible.builtin.file: - path: "{{ deployment_path }}/deployment_configs" + path: "{{ timestamped_deployment_path }}/deployment_configs" state: directory - name: Copy BEC service config become_user: "{{ deployment_user }}" ansible.builtin.template: src: bec_config_server.yaml.j2 - dest: "{{ deployment_path }}/deployment_configs/server.yaml" + dest: "{{ timestamped_deployment_path }}/deployment_configs/server.yaml" notify: - (Re-)start BEC server @@ -242,7 +242,7 @@ become_user: "{{ deployment_user }}" ansible.builtin.template: src: bec_config_client.yaml.j2 - dest: "{{ deployment_path }}/deployment_configs/client.yaml" + dest: "{{ timestamped_deployment_path }}/deployment_configs/client.yaml" - name: Copy BEC service files ansible.builtin.template: @@ -262,7 +262,7 @@ - name: Create a link to the current deployment become_user: "{{ deployment_user }}" ansible.builtin.file: - src: "{{ deployment_path }}" + src: "{{ timestamped_deployment_path }}" dest: "{{ deployment_path_prefix }}/{{ deployment_name }}" state: link when: not ansible_check_mode @@ -271,14 +271,14 @@ become_user: "{{ deployment_user }}" ansible.builtin.copy: src: bec_set_account - dest: "{{ deployment_path }}/bin/" + dest: "{{ timestamped_deployment_path }}/bin/" mode: u+x,g+x - name: Copy BEC set account script become_user: "{{ deployment_user }}" ansible.builtin.template: src: bec-set-account.j2 - dest: "{{ deployment_path }}/bec-set-account" + dest: "{{ timestamped_deployment_path }}/bec-set-account" mode: u+x,g+rx - name: Add bec startup script diff --git a/templates/bec-server.service.j2 b/templates/bec-server.service.j2 index 2601f8d..9186c05 100644 --- a/templates/bec-server.service.j2 +++ b/templates/bec-server.service.j2 @@ -5,7 +5,7 @@ Description=bec-server service Type=oneshot RemainAfterExit=yes User={{ service_user }} -WorkingDirectory={{ deployment_path }} +WorkingDirectory={{ timestamped_deployment_path }} ExecStart=/bin/bash /usr/local/sbin/bec-server.sh Restart=on-failure diff --git a/templates/bec-server.sh.j2 b/templates/bec-server.sh.j2 index bfbe407..0302f1a 100644 --- a/templates/bec-server.sh.j2 +++ b/templates/bec-server.sh.j2 @@ -1,2 +1,2 @@ source {{ bec_venv_path }}/bin/activate -exec bec-server start --config {{ deployment_path }}/deployment_configs/server.yaml --interface tmux +exec bec-server start --config {{ timestamped_deployment_path }}/deployment_configs/server.yaml --interface tmux diff --git a/templates/bec-set-account.j2 b/templates/bec-set-account.j2 index 8a57b6d..828e28d 100755 --- a/templates/bec-set-account.j2 +++ b/templates/bec-set-account.j2 @@ -5,4 +5,4 @@ if [ $# -ne 1 ]; then exit 1 fi -exec {{ deployment_path }}/bin/bec_set_account -redis-host {{ ansible_hostname }} -pgroup "$1" +exec {{ timestamped_deployment_path }}/bin/bec_set_account -redis-host {{ ansible_hostname }} -pgroup "$1" diff --git a/templates/bec.j2 b/templates/bec.j2 index 0fe10e2..6a4775b 100644 --- a/templates/bec.j2 +++ b/templates/bec.j2 @@ -1,4 +1,4 @@ #!/bin/sh source {{ bec_venv_path }}/bin/activate -exec bec --config {{ deployment_path }}/deployment_configs/client.yaml "$@" +exec bec --config {{ timestamped_deployment_path }}/deployment_configs/client.yaml "$@" diff --git a/vars/main.yaml b/vars/main.yaml index f7dc10f..f7a7908 100644 --- a/vars/main.yaml +++ b/vars/main.yaml @@ -1,4 +1,4 @@ --- -deployment_path: "{{ deployment_path_prefix }}/{{ deployment_name }}_deployments/{{ ansible_date_time['iso8601_basic_short'] }}" -bec_venv_path: "{{ deployment_path }}/bec_venv" +timestamped_deployment_path: "{{ deployment_path_prefix }}/{{ deployment_name }}_deployments/{{ ansible_date_time['iso8601_basic_short'] }}" +bec_venv_path: "{{ timestamped_deployment_path }}/bec_venv" user_git_branch_name: "{{ git_username }}_{{ deployment_name }}_{{ ansible_date_time['iso8601_basic_short'] }}"