From b1f81e805690d2411158790841b013badb3bed09 Mon Sep 17 00:00:00 2001 From: Rafael Cardoso Date: Tue, 18 Jan 2022 13:41:35 -0300 Subject: [PATCH 1/4] Add Bullseye var file to Octave and MCA roles --- roles/lnls-ans-role-epics-mca/meta/main.yml | 1 + roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml | 10 ++++++++++ roles/lnls-ans-role-octave/meta/main.yml | 1 + roles/lnls-ans-role-octave/vars/Debian-bullseye.yml | 5 +++++ 4 files changed, 17 insertions(+) create mode 100644 roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml create mode 100644 roles/lnls-ans-role-octave/vars/Debian-bullseye.yml diff --git a/roles/lnls-ans-role-epics-mca/meta/main.yml b/roles/lnls-ans-role-epics-mca/meta/main.yml index 4fe74ced..da2f0e62 100644 --- a/roles/lnls-ans-role-epics-mca/meta/main.yml +++ b/roles/lnls-ans-role-epics-mca/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - buster - stretch - jessie + - bullseye - name: Ubuntu versions: - xenial diff --git a/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml b/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml new file mode 100644 index 00000000..051f2740 --- /dev/null +++ b/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml @@ -0,0 +1,10 @@ +--- +__epics_mca_packages: + - bzip2 + - binutils + - git + - automake + - autoconf + - make + - libtool + - g++ diff --git a/roles/lnls-ans-role-octave/meta/main.yml b/roles/lnls-ans-role-octave/meta/main.yml index ba9a5f54..e70fe4ef 100644 --- a/roles/lnls-ans-role-octave/meta/main.yml +++ b/roles/lnls-ans-role-octave/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - buster - stretch - jessie + - bullseye - name: Ubuntu versions: - xenial diff --git a/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml b/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml new file mode 100644 index 00000000..da70204b --- /dev/null +++ b/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml @@ -0,0 +1,5 @@ +--- +__octave_packages: + - "octave" + - "liboctave-dev" + - "epstool" From 2f383009bce853512fe79caafeb5f4eef26658d6 Mon Sep 17 00:00:00 2001 From: Rafael Cardoso Date: Mon, 24 Jan 2022 15:25:36 -0300 Subject: [PATCH 2/4] Add versions of packages for bullseye --- .../sirius/group_vars/Debian-bullseye.yml | 177 ++++++++++++++++++ .../vars/Debian-bullseye.yml | 16 +- .../vars/Debian-bullseye.yml | 6 +- 3 files changed, 188 insertions(+), 11 deletions(-) create mode 100644 inventories/sirius/group_vars/Debian-bullseye.yml diff --git a/inventories/sirius/group_vars/Debian-bullseye.yml b/inventories/sirius/group_vars/Debian-bullseye.yml new file mode 100644 index 00000000..67e035e0 --- /dev/null +++ b/inventories/sirius/group_vars/Debian-bullseye.yml @@ -0,0 +1,177 @@ +--- + +global_role_cs_studio: true +global_role_sirius_bbb: true +global_role_octave: true +global_role_epics_mca: true +global_role_desktop_settings: true +global_role_visual_studio_code: true + +# === Services +glusterfs_service_server: "glusterfs-server" + +# === Docker + +docker_version: "5:19.03.14~3-0~debian-stretch" +docker_package: "{{ docker_package_base }}={{ docker_version }}" + +# === apt packages versions === + +pkg_version_zabbix_agent: "1:4.0.3*" +pkg_version_network_manager: "1.14.6*" +pkg_version_python_dbus: "1.2.4*" +pkg_version_python3_dbus: "1.2.4*" +pkg_version_libnm0: "1.14.6*" +pkg_version_autofs: "5.1.2*" +pkg_version_build_essential: "12.3*" +pkg_version_cups: "2.2.1*" +pkg_version_dconf_cli: "0.26.0*" +pkg_version_dmz_cursor_theme: "0.4.4*" +pkg_version_epics_dev: "3.15.6*" +pkg_version_epics_pcas_dev: "3.15.6*" +pkg_version_htop: "2.0.2*" +pkg_version_ipython3: "5.1.0*" +pkg_version_gconf2: "3.2.6*" +pkg_version_git: "1:2.11.0*" +pkg_version_make: "4.1*" +pkg_version_bzip2: "1.0.6*" +pkg_version_binutils: "2.28*" +pkg_version_re2c: "0.16-2*" +pkg_version_automake: "1:1.15*" +pkg_version_autoconf: "2.69*" +pkg_version_libtool: "2.4.6*" +pkg_version_gplusplus: "4:6.3.0*" +pkg_version_curl: "7.52.1*" +pkg_version_libglib2_0_0: "2.50.3*" +pkg_version_libglib2_0_dev: "2.50.3*" +pkg_version_uuid_dev: "2.29.2*" +pkg_version_libreadline7: "7.0*" +pkg_version_libusb_1_0_0_dev: "2:1.0.21*" +pkg_version_libbz2_dev: "1.0.6*" +pkg_version_libxml2_dev: "2.9.4*" +pkg_version_perl: "5.24.1*" +pkg_version_libextutils_cchecker_perl: "0.10*" +pkg_version_libextutils_f77_perl: "1.20*" +pkg_version_libextutils_libbuilder_perl: "0.08*" +pkg_version_libextutils_pkgconfig_perl: "1.15*" +pkg_version_libextutils_xsbuilder_perl: "0.28*" +pkg_version_libextutils_xspp_perl: "0.1800*" +pkg_version_gvncviewer: "0.6.0*" +pkg_version_libasound2: "1.1.3*" +pkg_version_libc6_dev: "2.24*" +pkg_version_apt_setuptools: "33.1.1*" +pkg_version_wmctrl: "1.07*" +pkg_version_libdbus_1_3: "1.10.*" +pkg_version_libffi6: "3.2.1*" +pkg_version_libffi_dev: "3.2.1*" +pkg_version_libfreetype6: "2.6.3*" +pkg_version_libfreetype6_dev: "2.6.3*" +pkg_version_libfontconfig1: "2.11.0*" +pkg_version_libxkbcommon_dev: "0.7.1*" +pkg_version_libxkbcommon_x11_dev: "0.7.1*" +pkg_version_libgdbm_dev: "1.8.3*" +pkg_version_libglu1_mesa_dev: "9.0.0*" +pkg_version_libgtk2_0_0: "2.24*" +pkg_version_libncursesw5_dev: "6.0+20161126*" +pkg_version_libqt5opengl5_dev: "5.7.1*" +pkg_version_libreadline5: "5.2*" +pkg_version_libreadline_dev: "7.0*" +pkg_version_libsqlite3_dev: "3.16.2*" +pkg_version_libssl_dev: "1.1.0*" +pkg_version_libxss1: "1:1.2.2*" +pkg_version_nmap: "7.40*" +pkg_version_ntp: "1:4.2.8*" +pkg_version_nvidia_driver: "390.116*" +pkg_version_nvidia_kernel_dkms: "390.116*" +pkg_version_openjdk_11_jdk: "11.0.*" +pkg_version_openjfx: "8u141*" +pkg_version_python3_dev: "3.5.3*" +pkg_version_python3_pip: "9.0.1*" +pkg_version_python3_pyqt5_qtsvg: "5.7*" +pkg_version_python3_tk: "3.5.3*" +pkg_version_python_pip: "9.0.1*" +pkg_version_libblas_dev: "3.7*" +pkg_version_liblapack_dev: "3.7*" +pkg_version_libgsl_dev: "2.3*" +pkg_version_rsync: "3.1.2*" +pkg_version_qt5_default: "5.7.1*" +pkg_version_qtbase5_dev: "5.7.1*" +pkg_version_qttools5_dev_tools: "5.7.1*" +pkg_version_qt5_qmake: "5.7.1*" +pkg_version_sip_dev: "4.18.1*" +pkg_version_tk_dev: "8.6*" +pkg_version_swig: "3.0*" +pkg_version_sshpass: "1.06*" +pkg_version_xfce4: "4.12*" +pkg_version_xfce4_goodies: "4.12*" +pkg_version_remmina: "1.3.3*" +pkg_version_remmina_plugin_rdp: "1.3.3*" +pkg_version_remmina_plugin_secret: "1.3.3*" +pkg_version_vim: "2:8.0*" +pkg_version_tightvncserver: "1:1.3.9*" +pkg_version_rdesktop: "1.8.6*" +pkg_version_unzip: "6.0*" +pkg_version_openjdk_8_jdk: "8u222-b10*" +pkg_version_openjdk_8_jre: "8u222-b10*" +pkg_version_xcursor_themes: "1.0.4*" +pkg_version_x11_common: "1:7.7*" +pkg_version_epics_extensions_dev: "20130514.5*" +pkg_version_edm_dev: "1.12.105B*" +pkg_version_gnome_terminal: "3.22.2*" +pkg_version_xpra: "0.17.6*" +pkg_version_winswitch: "0.12.21*" +pkg_version_xvfb: "2:1.19.2*" +pkg_version_bc: "1.06.95*" +pkg_version_wait_for_it: "0.0*" +pkg_version_octave: "4.0.3*" +pkg_version_liboctave_dev: "4.0.3*" +pkg_version_epstool: "3.08*" +pkg_version_texlive_latex_recommended: "2016.20170123*" +pkg_version_dvipng: "1.14*" +pkg_version_ghostscript: "9.26*" +pkg_version_libxcb_dri3_0: "1.14*" +pkg_version_libdrm2: "2.4.74*" +pkg_version_libgbm1: "13.0.6*" + + +# === pip packages === + +pkg_version_pip: "20.1.1" +pkg_version_python_dateutil: "2.8.1" +pkg_version_cairocffi: "1.1.0" +pkg_version_pyparsing: "2.4.2" +pkg_version_jupyter: "1.0.0" +pkg_version_jupyter_nbextensions: "0.5.1" +pkg_version_ipython_pip: "7.15.0" +pkg_version_six: "1.13.0" +pkg_version_numpy: "1.18" +pkg_version_bottleneck: "1.3" +pkg_version_pylama: "7.6.6" +pkg_version_pep8: "1.7.1" +pkg_version_autopep8: "1.4.3" +pkg_version_pydocstyle: "4.0.1" +pkg_version_pylint: "2.3.1" +pkg_version_matplotlib: "3.1.2" +pkg_version_pandas: "0.25.3" +pkg_version_pcaspy: "0.7.3" +pkg_version_psutil: "5.6.7" +pkg_version_pyepics: "3.4.0" +pkg_version_pyqtgraph: "0.11.0" +pkg_version_python_nmap: "0.6.1" +pkg_version_requests: "2.22.0" +pkg_version_scipy: "1.4.1" +pkg_version_setuptools: "44.0.0" +pkg_version_sh: "1.12.14" +pkg_version_termcolor: "1.1.0" +pkg_version_wakeonlan: "1.1.6" +pkg_version_xlrd: "1.2.0" +pkg_version_PyQt5: "5.11.3" +pkg_version_PyQt5_sip: "12.7.0" +pkg_version_pydm: "1.10.2" +pkg_version_timechart: "1.2.2" +pkg_version_qtawesome: "0.7.2" +pkg_version_pyvisa: "1.10.1" +pkg_version_pyvisa_py: "0.3.1" +pkg_version_ansible: "2.9.13" +pkg_version_aiohttp: "3.7.4" +pkg_version_pytest: "6.2.4" diff --git a/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml b/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml index 051f2740..a4bcabfe 100644 --- a/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml +++ b/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml @@ -1,10 +1,10 @@ --- __epics_mca_packages: - - bzip2 - - binutils - - git - - automake - - autoconf - - make - - libtool - - g++ + - "bzip2{{ (pkg_version_bzip2 | length > 0) | ternary('=' + pkg_version_bzip2, '') }}" + - "binutils{{ (pkg_version_binutils | length > 0) | ternary('=' + pkg_version_binutils, '') }}" + - "git{{ (pkg_version_git | length > 0) | ternary('=' + pkg_version_git, '') }}" + - "automake{{ (pkg_version_automake | length > 0) | ternary('=' + pkg_version_automake, '') }}" + - "autoconf{{ (pkg_version_autoconf | length > 0) | ternary('=' + pkg_version_autoconf, '') }}" + - "make{{ (pkg_version_make | length > 0) | ternary('=' + pkg_version_make, '') }}" + - "libtool{{ (pkg_version_libtool | length > 0) | ternary('=' + pkg_version_libtool, '') }}" + - "g++{{ (pkg_version_gplusplus | length > 0) | ternary('=' + pkg_version_gplusplus, '') }}" diff --git a/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml b/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml index da70204b..002e6bdb 100644 --- a/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml +++ b/roles/lnls-ans-role-octave/vars/Debian-bullseye.yml @@ -1,5 +1,5 @@ --- __octave_packages: - - "octave" - - "liboctave-dev" - - "epstool" + - "octave{{ (pkg_version_octave | length > 0) | ternary('=' + pkg_version_octave, '') }}" + - "liboctave-dev{{ (pkg_version_liboctave_dev | length > 0) | ternary('=' + pkg_version_liboctave_dev, '') }}" + - "epstool{{ (pkg_version_epstool | length > 0) | ternary('=' + pkg_version_epstool, '') }}" From 6895d0f9a8f2811fdd9ad2ca71add069b876fb54 Mon Sep 17 00:00:00 2001 From: Rafael Cardoso Date: Thu, 27 Jan 2022 15:14:23 -0300 Subject: [PATCH 3/4] Define packages versions for bullseye --- .../sirius/group_vars/Debian-bullseye.yml | 173 ++---------------- .../lnls-ans-role-epics-mca/defaults/main.yml | 2 + roles/lnls-ans-role-epics-mca/meta/main.yml | 2 +- .../vars/Debian-bullseye.yml | 2 + 4 files changed, 17 insertions(+), 162 deletions(-) diff --git a/inventories/sirius/group_vars/Debian-bullseye.yml b/inventories/sirius/group_vars/Debian-bullseye.yml index 67e035e0..a48a6633 100644 --- a/inventories/sirius/group_vars/Debian-bullseye.yml +++ b/inventories/sirius/group_vars/Debian-bullseye.yml @@ -8,170 +8,21 @@ global_role_desktop_settings: true global_role_visual_studio_code: true # === Services -glusterfs_service_server: "glusterfs-server" - -# === Docker - -docker_version: "5:19.03.14~3-0~debian-stretch" -docker_package: "{{ docker_package_base }}={{ docker_version }}" +glusterfs_service_server: "glusterd" # === apt packages versions === -pkg_version_zabbix_agent: "1:4.0.3*" -pkg_version_network_manager: "1.14.6*" -pkg_version_python_dbus: "1.2.4*" -pkg_version_python3_dbus: "1.2.4*" -pkg_version_libnm0: "1.14.6*" -pkg_version_autofs: "5.1.2*" -pkg_version_build_essential: "12.3*" -pkg_version_cups: "2.2.1*" -pkg_version_dconf_cli: "0.26.0*" -pkg_version_dmz_cursor_theme: "0.4.4*" +pkg_version_zabbix_agent: "1:5.0.8+dfsg-1" +pkg_version_autofs: "5.1.7*" +pkg_version_ntp: "1:4.2.8*" +pkg_version_octave: "6.2.0*" +pkg_version_liboctave_dev: "6.2.0*" +pkg_version_epstool: "3.09*" +pkg_version_bzip2: "1.0.8*" +pkg_version_binutils: "2.35*" pkg_version_epics_dev: "3.15.6*" pkg_version_epics_pcas_dev: "3.15.6*" -pkg_version_htop: "2.0.2*" -pkg_version_ipython3: "5.1.0*" -pkg_version_gconf2: "3.2.6*" -pkg_version_git: "1:2.11.0*" -pkg_version_make: "4.1*" -pkg_version_bzip2: "1.0.6*" -pkg_version_binutils: "2.28*" -pkg_version_re2c: "0.16-2*" -pkg_version_automake: "1:1.15*" -pkg_version_autoconf: "2.69*" pkg_version_libtool: "2.4.6*" -pkg_version_gplusplus: "4:6.3.0*" -pkg_version_curl: "7.52.1*" -pkg_version_libglib2_0_0: "2.50.3*" -pkg_version_libglib2_0_dev: "2.50.3*" -pkg_version_uuid_dev: "2.29.2*" -pkg_version_libreadline7: "7.0*" -pkg_version_libusb_1_0_0_dev: "2:1.0.21*" -pkg_version_libbz2_dev: "1.0.6*" -pkg_version_libxml2_dev: "2.9.4*" -pkg_version_perl: "5.24.1*" -pkg_version_libextutils_cchecker_perl: "0.10*" -pkg_version_libextutils_f77_perl: "1.20*" -pkg_version_libextutils_libbuilder_perl: "0.08*" -pkg_version_libextutils_pkgconfig_perl: "1.15*" -pkg_version_libextutils_xsbuilder_perl: "0.28*" -pkg_version_libextutils_xspp_perl: "0.1800*" -pkg_version_gvncviewer: "0.6.0*" -pkg_version_libasound2: "1.1.3*" -pkg_version_libc6_dev: "2.24*" -pkg_version_apt_setuptools: "33.1.1*" -pkg_version_wmctrl: "1.07*" -pkg_version_libdbus_1_3: "1.10.*" -pkg_version_libffi6: "3.2.1*" -pkg_version_libffi_dev: "3.2.1*" -pkg_version_libfreetype6: "2.6.3*" -pkg_version_libfreetype6_dev: "2.6.3*" -pkg_version_libfontconfig1: "2.11.0*" -pkg_version_libxkbcommon_dev: "0.7.1*" -pkg_version_libxkbcommon_x11_dev: "0.7.1*" -pkg_version_libgdbm_dev: "1.8.3*" -pkg_version_libglu1_mesa_dev: "9.0.0*" -pkg_version_libgtk2_0_0: "2.24*" -pkg_version_libncursesw5_dev: "6.0+20161126*" -pkg_version_libqt5opengl5_dev: "5.7.1*" -pkg_version_libreadline5: "5.2*" -pkg_version_libreadline_dev: "7.0*" -pkg_version_libsqlite3_dev: "3.16.2*" -pkg_version_libssl_dev: "1.1.0*" -pkg_version_libxss1: "1:1.2.2*" -pkg_version_nmap: "7.40*" -pkg_version_ntp: "1:4.2.8*" -pkg_version_nvidia_driver: "390.116*" -pkg_version_nvidia_kernel_dkms: "390.116*" -pkg_version_openjdk_11_jdk: "11.0.*" -pkg_version_openjfx: "8u141*" -pkg_version_python3_dev: "3.5.3*" -pkg_version_python3_pip: "9.0.1*" -pkg_version_python3_pyqt5_qtsvg: "5.7*" -pkg_version_python3_tk: "3.5.3*" -pkg_version_python_pip: "9.0.1*" -pkg_version_libblas_dev: "3.7*" -pkg_version_liblapack_dev: "3.7*" -pkg_version_libgsl_dev: "2.3*" -pkg_version_rsync: "3.1.2*" -pkg_version_qt5_default: "5.7.1*" -pkg_version_qtbase5_dev: "5.7.1*" -pkg_version_qttools5_dev_tools: "5.7.1*" -pkg_version_qt5_qmake: "5.7.1*" -pkg_version_sip_dev: "4.18.1*" -pkg_version_tk_dev: "8.6*" -pkg_version_swig: "3.0*" -pkg_version_sshpass: "1.06*" -pkg_version_xfce4: "4.12*" -pkg_version_xfce4_goodies: "4.12*" -pkg_version_remmina: "1.3.3*" -pkg_version_remmina_plugin_rdp: "1.3.3*" -pkg_version_remmina_plugin_secret: "1.3.3*" -pkg_version_vim: "2:8.0*" -pkg_version_tightvncserver: "1:1.3.9*" -pkg_version_rdesktop: "1.8.6*" -pkg_version_unzip: "6.0*" -pkg_version_openjdk_8_jdk: "8u222-b10*" -pkg_version_openjdk_8_jre: "8u222-b10*" -pkg_version_xcursor_themes: "1.0.4*" -pkg_version_x11_common: "1:7.7*" -pkg_version_epics_extensions_dev: "20130514.5*" -pkg_version_edm_dev: "1.12.105B*" -pkg_version_gnome_terminal: "3.22.2*" -pkg_version_xpra: "0.17.6*" -pkg_version_winswitch: "0.12.21*" -pkg_version_xvfb: "2:1.19.2*" -pkg_version_bc: "1.06.95*" -pkg_version_wait_for_it: "0.0*" -pkg_version_octave: "4.0.3*" -pkg_version_liboctave_dev: "4.0.3*" -pkg_version_epstool: "3.08*" -pkg_version_texlive_latex_recommended: "2016.20170123*" -pkg_version_dvipng: "1.14*" -pkg_version_ghostscript: "9.26*" -pkg_version_libxcb_dri3_0: "1.14*" -pkg_version_libdrm2: "2.4.74*" -pkg_version_libgbm1: "13.0.6*" - - -# === pip packages === - -pkg_version_pip: "20.1.1" -pkg_version_python_dateutil: "2.8.1" -pkg_version_cairocffi: "1.1.0" -pkg_version_pyparsing: "2.4.2" -pkg_version_jupyter: "1.0.0" -pkg_version_jupyter_nbextensions: "0.5.1" -pkg_version_ipython_pip: "7.15.0" -pkg_version_six: "1.13.0" -pkg_version_numpy: "1.18" -pkg_version_bottleneck: "1.3" -pkg_version_pylama: "7.6.6" -pkg_version_pep8: "1.7.1" -pkg_version_autopep8: "1.4.3" -pkg_version_pydocstyle: "4.0.1" -pkg_version_pylint: "2.3.1" -pkg_version_matplotlib: "3.1.2" -pkg_version_pandas: "0.25.3" -pkg_version_pcaspy: "0.7.3" -pkg_version_psutil: "5.6.7" -pkg_version_pyepics: "3.4.0" -pkg_version_pyqtgraph: "0.11.0" -pkg_version_python_nmap: "0.6.1" -pkg_version_requests: "2.22.0" -pkg_version_scipy: "1.4.1" -pkg_version_setuptools: "44.0.0" -pkg_version_sh: "1.12.14" -pkg_version_termcolor: "1.1.0" -pkg_version_wakeonlan: "1.1.6" -pkg_version_xlrd: "1.2.0" -pkg_version_PyQt5: "5.11.3" -pkg_version_PyQt5_sip: "12.7.0" -pkg_version_pydm: "1.10.2" -pkg_version_timechart: "1.2.2" -pkg_version_qtawesome: "0.7.2" -pkg_version_pyvisa: "1.10.1" -pkg_version_pyvisa_py: "0.3.1" -pkg_version_ansible: "2.9.13" -pkg_version_aiohttp: "3.7.4" -pkg_version_pytest: "6.2.4" +pkg_version_make: "4.3*" +pkg_version_autoconf: "2.69*" +pkg_version_automake: "1:1.16*" \ No newline at end of file diff --git a/roles/lnls-ans-role-epics-mca/defaults/main.yml b/roles/lnls-ans-role-epics-mca/defaults/main.yml index fd82f205..8b294371 100644 --- a/roles/lnls-ans-role-epics-mca/defaults/main.yml +++ b/roles/lnls-ans-role-epics-mca/defaults/main.yml @@ -8,6 +8,8 @@ pkg_version_autoconf: "" pkg_version_make: "" pkg_version_libtool: "" pkg_version_gplusplus: "" +pkg_version_epics_dev: "" +pkg_version_epics_pcas_dev: "" # epics_mca_core_tag: diff --git a/roles/lnls-ans-role-epics-mca/meta/main.yml b/roles/lnls-ans-role-epics-mca/meta/main.yml index da2f0e62..54af0b16 100644 --- a/roles/lnls-ans-role-epics-mca/meta/main.yml +++ b/roles/lnls-ans-role-epics-mca/meta/main.yml @@ -23,5 +23,5 @@ galaxy_info: - system dependencies: - - lnls-ans-role-epics + #- lnls-ans-role-epics - lnls-ans-role-octave diff --git a/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml b/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml index a4bcabfe..3138f06c 100644 --- a/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml +++ b/roles/lnls-ans-role-epics-mca/vars/Debian-bullseye.yml @@ -8,3 +8,5 @@ __epics_mca_packages: - "make{{ (pkg_version_make | length > 0) | ternary('=' + pkg_version_make, '') }}" - "libtool{{ (pkg_version_libtool | length > 0) | ternary('=' + pkg_version_libtool, '') }}" - "g++{{ (pkg_version_gplusplus | length > 0) | ternary('=' + pkg_version_gplusplus, '') }}" + - "epics-dev{{ (pkg_version_epics_dev | length > 0) | ternary('=' + pkg_version_epics_dev, '') }}" + - "epics-pcas-dev{{ (pkg_version_epics_pcas_dev | length > 0) | ternary('=' + pkg_version_epics_pcas_dev, '') }}" From dd83ae3fa1ba096937122f7fb43369535992bbd3 Mon Sep 17 00:00:00 2001 From: Rafael Cardoso Date: Wed, 9 Feb 2022 10:03:36 -0300 Subject: [PATCH 4/4] Correct mca role dependencies --- roles/lnls-ans-role-epics-mca/defaults/main.yml | 2 -- roles/lnls-ans-role-epics-mca/meta/main.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/lnls-ans-role-epics-mca/defaults/main.yml b/roles/lnls-ans-role-epics-mca/defaults/main.yml index 8b294371..fd82f205 100644 --- a/roles/lnls-ans-role-epics-mca/defaults/main.yml +++ b/roles/lnls-ans-role-epics-mca/defaults/main.yml @@ -8,8 +8,6 @@ pkg_version_autoconf: "" pkg_version_make: "" pkg_version_libtool: "" pkg_version_gplusplus: "" -pkg_version_epics_dev: "" -pkg_version_epics_pcas_dev: "" # epics_mca_core_tag: diff --git a/roles/lnls-ans-role-epics-mca/meta/main.yml b/roles/lnls-ans-role-epics-mca/meta/main.yml index 54af0b16..da2f0e62 100644 --- a/roles/lnls-ans-role-epics-mca/meta/main.yml +++ b/roles/lnls-ans-role-epics-mca/meta/main.yml @@ -23,5 +23,5 @@ galaxy_info: - system dependencies: - #- lnls-ans-role-epics + - lnls-ans-role-epics - lnls-ans-role-octave