From f98d22cc351232b5b87d9340cf923c007596fac5 Mon Sep 17 00:00:00 2001 From: Martin Vuk Date: Mon, 24 Jun 2024 11:13:28 +0200 Subject: [PATCH 01/12] Bump version of Julia to 10.4 --- roles/julia/tasks/main_lin.yml | 4 ++-- roles/julia/tasks/main_win.yml | 2 +- roles/linroom/tasks/julia.yml | 4 ++-- roles/winroom/tasks/julia.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/julia/tasks/main_lin.yml b/roles/julia/tasks/main_lin.yml index 0d9c800..160dbfe 100644 --- a/roles/julia/tasks/main_lin.yml +++ b/roles/julia/tasks/main_lin.yml @@ -4,9 +4,9 @@ file: path: /opt/Julia state: directory - - name: Download and unpack Eclipse + - name: Download and unpack Julia unarchive: - src: https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz + src: https://julialang-s3.julialang.org/bin/linux/x64/1.10/julia-1.10.4-linux-x86_64.tar.gz dest: /opt/Julia remote_src: yes diff --git a/roles/julia/tasks/main_win.yml b/roles/julia/tasks/main_win.yml index ed2164a..73172bd 100644 --- a/roles/julia/tasks/main_win.yml +++ b/roles/julia/tasks/main_win.yml @@ -1,4 +1,4 @@ - name: Install Julia win_package: - path: https://julialang-s3.julialang.org/bin/winnt/x64/1.9/julia-1.9.3-win64.exe + path: https://julialang-s3.julialang.org/bin/winnt/x64/1.10/julia-1.10.4-win64.exe arguments: /VerySilent /AllUsers diff --git a/roles/linroom/tasks/julia.yml b/roles/linroom/tasks/julia.yml index 0d9c800..160dbfe 100644 --- a/roles/linroom/tasks/julia.yml +++ b/roles/linroom/tasks/julia.yml @@ -4,9 +4,9 @@ file: path: /opt/Julia state: directory - - name: Download and unpack Eclipse + - name: Download and unpack Julia unarchive: - src: https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz + src: https://julialang-s3.julialang.org/bin/linux/x64/1.10/julia-1.10.4-linux-x86_64.tar.gz dest: /opt/Julia remote_src: yes diff --git a/roles/winroom/tasks/julia.yml b/roles/winroom/tasks/julia.yml index ed2164a..73172bd 100644 --- a/roles/winroom/tasks/julia.yml +++ b/roles/winroom/tasks/julia.yml @@ -1,4 +1,4 @@ - name: Install Julia win_package: - path: https://julialang-s3.julialang.org/bin/winnt/x64/1.9/julia-1.9.3-win64.exe + path: https://julialang-s3.julialang.org/bin/winnt/x64/1.10/julia-1.10.4-win64.exe arguments: /VerySilent /AllUsers From 5f2d47b9b5580ee314fff54a7dfcede18d50a8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Tue, 6 Aug 2024 15:43:51 +0200 Subject: [PATCH 02/12] Re-add the missing README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..7034340 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +Ansible playbooks for deploying classroom computers. Run with something like: + + ansible-playbook --user --ask-pass \ + --become-user= + --inventory hosts winsetup.yml + + ansible-playbook --user --ask-pass \ + --inventory hosts linsetup.yml From 14a317736e1c3ab6432cbe3696e05e1b53fe89b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Tue, 6 Aug 2024 16:11:43 +0200 Subject: [PATCH 03/12] Fix typos in dependencies, add missing files --- roles/NDN-63729/meta/main.yml | 2 +- roles/algobuilder/tasks/main.yml | 4 ++++ roles/algobuilder/tasks/main_lin.yml | 4 ++++ roles/algobuilder/tasks/main_win.yml | 30 ++++++++++++++++++++++++++ roles/powerdesigner/tasks/main_win.yml | 2 +- 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 roles/algobuilder/tasks/main.yml create mode 100644 roles/algobuilder/tasks/main_lin.yml create mode 100644 roles/algobuilder/tasks/main_win.yml diff --git a/roles/NDN-63729/meta/main.yml b/roles/NDN-63729/meta/main.yml index 8a1be05..12b4f3e 100644 --- a/roles/NDN-63729/meta/main.yml +++ b/roles/NDN-63729/meta/main.yml @@ -7,4 +7,4 @@ dependencies: - role: putty - role: vivado - - role: cp210x-vcp-drivers-win10 + - role: cp2102_driver diff --git a/roles/algobuilder/tasks/main.yml b/roles/algobuilder/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/algobuilder/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/algobuilder/tasks/main_lin.yml b/roles/algobuilder/tasks/main_lin.yml new file mode 100644 index 0000000..24f0d0e --- /dev/null +++ b/roles/algobuilder/tasks/main_lin.yml @@ -0,0 +1,4 @@ +- name: Do not install AlgoBuilder + debug: + msg: "Do not install AlgoBuilder on Linux" + diff --git a/roles/algobuilder/tasks/main_win.yml b/roles/algobuilder/tasks/main_win.yml new file mode 100644 index 0000000..3ccb74c --- /dev/null +++ b/roles/algobuilder/tasks/main_win.yml @@ -0,0 +1,30 @@ +# TODO check install status +- name: Check AlgoBuilder install status + win_stat: + path: C:\Program Files (x86)\Thonny\thonny.exe + register: file + +- when: not file.stat.exists + block: + - name: Download AlgoBuilder + win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=rcskhq&download=1" -O C:\AlgoBuilderSuite.exe + args: + creates: C:\AlgoBuilderSuite.exe + #win_get_url: + # follow_redirects: all + # http_agent: Wget/1.21.3 + # url: https://unilj-my.sharepoint.com/:u:/r/personal/rozman_fri1_uni-lj_si/Documents/Arhiv/ImportantFiles/AlgoBuilderSuite.exe?download=1 + # dest: C:\AlgoBuilderSuite.exe + #register: download + + - name: Install AlgoBuilder + win_package: + path: C:\AlgoBuilderSuite.exe + # path: "{{ download.dest }}" + arguments: /Verysilent /AllUsers + + - name: Remove temporary files + win_file: + path: C:\AlgoBuilderSuite.exe + # path: "{{ download.dest }}" + state: absent diff --git a/roles/powerdesigner/tasks/main_win.yml b/roles/powerdesigner/tasks/main_win.yml index 24f09fb..9bd6760 100644 --- a/roles/powerdesigner/tasks/main_win.yml +++ b/roles/powerdesigner/tasks/main_win.yml @@ -1,4 +1,4 @@ - name: Install PowerDesigner win_package: path: "{{ installers }}\\PowerDesigner 12.5\\cd1\\setup\\setup.exe" - arguments: "/s /f1\"{{ installers }}\\PowerDesigner 12.5\\setup.iss\" /f2\"C:\powerdesigner_log.iss\"" + arguments: "/s /f1\"{{ installers }}\\PowerDesigner 12.5\\setup.iss\" /f2\"C:\\powerdesigner_log.iss\"" From 644283c9faefcd85845ec608ae45d258b5b0b1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Tue, 6 Aug 2024 16:19:25 +0200 Subject: [PATCH 04/12] Bump msys2 version --- roles/msys2/tasks/main_win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/msys2/tasks/main_win.yml b/roles/msys2/tasks/main_win.yml index 7135835..0b3eb4a 100644 --- a/roles/msys2/tasks/main_win.yml +++ b/roles/msys2/tasks/main_win.yml @@ -7,7 +7,7 @@ block: - name: Download msys2 win_get_url: - url: "https://github.com/msys2/msys2-installer/releases/download/2023-07-18/msys2-x86_64-20230718.exe" + url: "https://github.com/msys2/msys2-installer/releases/download/2024-05-07/msys2-x86_64-20240507.exe" dest: 'C:\' register: download From 0c7fa0c3df4dc33c5bfb498730a52e31387e1319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Wed, 7 Aug 2024 00:08:34 +0200 Subject: [PATCH 05/12] fix powershell library Pscx --- roles/fri_base/tasks/main_win.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/fri_base/tasks/main_win.yml b/roles/fri_base/tasks/main_win.yml index 680e906..8eacd61 100644 --- a/roles/fri_base/tasks/main_win.yml +++ b/roles/fri_base/tasks/main_win.yml @@ -10,6 +10,8 @@ - name: Install PSCX community.windows.win_psmodule: name: Pscx + accept_license: true + allow_clobber: true state: present # TODO: turn on GPO to allow guest SMB logins From 81a183e28b34775c41434268bbccf14d693c7035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Wed, 7 Aug 2024 00:13:19 +0200 Subject: [PATCH 06/12] Bump Oracle JDK version --- roles/jdk/tasks/main_win.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/jdk/tasks/main_win.yml b/roles/jdk/tasks/main_win.yml index 08d0d20..26d4204 100644 --- a/roles/jdk/tasks/main_win.yml +++ b/roles/jdk/tasks/main_win.yml @@ -1,6 +1,6 @@ - name: Install Oracle JDK win_package: - path: https://download.oracle.com/java/20/latest/jdk-20_windows-x64_bin.msi + path: https://download.oracle.com/java/22/latest/jdk-22_windows-x64_bin.msi arguments: INSTALLLEVEL=3 - name: Find Java version @@ -40,7 +40,7 @@ - name: Download Java doc win_get_url: path: "{{ reg['raw_value'] }}" - url: https://download.oracle.com/otn_software/java/jdk/21+35/fd2272bbf8e04c3dbaee13770090416c/jdk-21_doc-all.zip + url: https://download.oracle.com/otn_software/java/jdk/22.0.2+9/c9ecb94cd31b495da20a27d4581645e8/jdk-22.0.2_doc-all.zip register: downloaded_docs - name: Unpack Java docs From 6a3b70eb4dc1579d9fb3144ca58bf947f473daf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Wed, 7 Aug 2024 14:39:48 +0200 Subject: [PATCH 07/12] Bump Android Studio version, remove deprecated HAXM --- roles/android_studio/tasks/main_lin.yml | 4 +-- roles/android_studio/tasks/main_win.yml | 46 ++++++++++++------------- roles/jdk/tasks/main_win.yml | 10 +++--- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/roles/android_studio/tasks/main_lin.yml b/roles/android_studio/tasks/main_lin.yml index d664992..86829d4 100644 --- a/roles/android_studio/tasks/main_lin.yml +++ b/roles/android_studio/tasks/main_lin.yml @@ -6,8 +6,8 @@ state: directory - name: Download and unpack Android Studio unarchive: - # src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.3.1.16/android-studio-2021.3.1.16-linux.tar.gz - src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.3.1.19/android-studio-2022.3.1.19-linux.tar.gz + # src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.3.1.19/android-studio-2022.3.1.19-linux.tar.gz + src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.1.1.12/android-studio-2024.1.1.12-linux.tar.gz creates: /opt/Android_Studio/android-studio/build.txt dest: /opt/Android_Studio remote_src: yes diff --git a/roles/android_studio/tasks/main_win.yml b/roles/android_studio/tasks/main_win.yml index 059c428..5e4a5d5 100644 --- a/roles/android_studio/tasks/main_win.yml +++ b/roles/android_studio/tasks/main_win.yml @@ -1,8 +1,8 @@ - name: Set Android Studio version set_fact: sdk_path: C:\android-sdk - studio_version: "2021.3.1.16" - tools_version: "8512546_latest" + studio_version: "2024.1.1.12" + tools_version: "11076708_latest" - name: Check Android Studio tools win_stat: @@ -57,28 +57,28 @@ ANDROID_PREFS_ROOT: D:\ GRADLE_USER_HOME: D:\.gradle -- name: Check HAXM install status - win_stat: - path: "%ProgramFiles%\\Intel\\HAXM" - register: file +#- name: Check HAXM install status +# win_stat: +# path: "%ProgramFiles%\\Intel\\HAXM" +# register: file -- when: not file.stat.exists - block: - - name: Download HAXM - win_get_url: - url: https://github.com/intel/haxm/releases/download/v7.7.1/haxm-windows_v7_7_1.zip - dest: C:\ - register: download +#- when: not file.stat.exists +# block: +# - name: Download HAXM +# win_get_url: +# url: https://github.com/intel/haxm/releases/download/v7.7.1/haxm-windows_v7_7_1.zip +# dest: C:\ +# register: download - - name: Unzip HAXM - win_unzip: - src: "{{ download.dest }}" - dest: C:\haxm +# - name: Unzip HAXM +# win_unzip: +# src: "{{ download.dest }}" +# dest: C:\haxm - - name: Install HAXM - win_command: C:\haxm\silent_install.bat +# - name: Install HAXM +# win_command: C:\haxm\silent_install.bat - - name: Remove temporaries - win_file: - path: C:\haxm - state: absent +# - name: Remove temporaries +# win_file: +# path: C:\haxm +# state: absent diff --git a/roles/jdk/tasks/main_win.yml b/roles/jdk/tasks/main_win.yml index 26d4204..ceb1996 100644 --- a/roles/jdk/tasks/main_win.yml +++ b/roles/jdk/tasks/main_win.yml @@ -35,16 +35,14 @@ type: dword data: 0 -#- name: Download Java documentation -# TODO: download Java doc - name: Download Java doc win_get_url: - path: "{{ reg['raw_value'] }}" + dest: "{{ reg['raw_value'] }}" url: https://download.oracle.com/otn_software/java/jdk/22.0.2+9/c9ecb94cd31b495da20a27d4581645e8/jdk-22.0.2_doc-all.zip - register: downloaded_docs + register: downloaded_docs - name: Unpack Java docs win_unzip: - path: "{{ downloaded_docs }}" - dest: "{{ reg['raw_value'] }}\\docs" + src: "{{ downloaded_docs['dest'] }}" + dest: "{{ reg['raw_value'] }}" delete_archive: yes From 49e5e6946bd77659c27c588d2bcaee3294e2ecc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Wed, 7 Aug 2024 15:32:59 +0200 Subject: [PATCH 08/12] Bump version of dotnet --- roles/IS-63714/meta/main.yml | 2 +- roles/PB-63707/meta/main.yml | 2 +- roles/TUP-63226/meta/main.yml | 2 +- roles/dotnet/tasks/main.yml | 4 ++++ roles/dotnet/tasks/main_lin.yml | 4 ++++ roles/dotnet/tasks/main_win.yml | 7 +++++++ 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 roles/dotnet/tasks/main.yml create mode 100644 roles/dotnet/tasks/main_lin.yml create mode 100644 roles/dotnet/tasks/main_win.yml diff --git a/roles/IS-63714/meta/main.yml b/roles/IS-63714/meta/main.yml index fb9009f..cb15546 100644 --- a/roles/IS-63714/meta/main.yml +++ b/roles/IS-63714/meta/main.yml @@ -4,7 +4,7 @@ dependencies: - role: docker - role: vscode - - role: dotnet6 + - role: dotnet - role: git - role: android_studio diff --git a/roles/PB-63707/meta/main.yml b/roles/PB-63707/meta/main.yml index 2ffafb3..4213eba 100644 --- a/roles/PB-63707/meta/main.yml +++ b/roles/PB-63707/meta/main.yml @@ -3,7 +3,7 @@ # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++ dependencies: - role: eclipse - - role: dotnet6 + - role: dotnet - role: jupyter - role: jdk - role: powerdesigner diff --git a/roles/TUP-63226/meta/main.yml b/roles/TUP-63226/meta/main.yml index 1181f8c..857f6a3 100644 --- a/roles/TUP-63226/meta/main.yml +++ b/roles/TUP-63226/meta/main.yml @@ -3,7 +3,7 @@ # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++ dependencies: - role: eclipse - - role: dotnet6 + - role: dotnet - role: jupyter - role: jdk - role: powerdesigner diff --git a/roles/dotnet/tasks/main.yml b/roles/dotnet/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/dotnet/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/dotnet/tasks/main_lin.yml b/roles/dotnet/tasks/main_lin.yml new file mode 100644 index 0000000..57661c2 --- /dev/null +++ b/roles/dotnet/tasks/main_lin.yml @@ -0,0 +1,4 @@ +- name: "Install Dotnet 8.0" + apt: + name: dotnet8 + state: latest diff --git a/roles/dotnet/tasks/main_win.yml b/roles/dotnet/tasks/main_win.yml new file mode 100644 index 0000000..2ea6b4c --- /dev/null +++ b/roles/dotnet/tasks/main_win.yml @@ -0,0 +1,7 @@ +- name: Install .NET 6 SDK + win_chocolatey: + name: dotnet-6.0-sdk + +- name: Install .NET 8 SDK + win_chocolatey: + name: dotnet-8.0-sdk From eb753d1ab8977ac72b4a65a23043162cd231ceb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Wed, 7 Aug 2024 15:38:41 +0200 Subject: [PATCH 09/12] Remove old dotnet6 --- roles/dotnet6/tasks/main.yml | 4 ---- roles/dotnet6/tasks/main_lin.yml | 4 ---- roles/dotnet6/tasks/main_win.yml | 3 --- 3 files changed, 11 deletions(-) delete mode 100644 roles/dotnet6/tasks/main.yml delete mode 100644 roles/dotnet6/tasks/main_lin.yml delete mode 100644 roles/dotnet6/tasks/main_win.yml diff --git a/roles/dotnet6/tasks/main.yml b/roles/dotnet6/tasks/main.yml deleted file mode 100644 index 55203f6..0000000 --- a/roles/dotnet6/tasks/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- import_tasks: main_win.yml - when: ansible_connection == 'winrm' -- import_tasks: main_lin.yml - when: ansible_connection == 'ssh' diff --git a/roles/dotnet6/tasks/main_lin.yml b/roles/dotnet6/tasks/main_lin.yml deleted file mode 100644 index 08fc2da..0000000 --- a/roles/dotnet6/tasks/main_lin.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: "Install Dotnet 6.0" - apt: - name: dotnet6 - state: latest diff --git a/roles/dotnet6/tasks/main_win.yml b/roles/dotnet6/tasks/main_win.yml deleted file mode 100644 index 62e8167..0000000 --- a/roles/dotnet6/tasks/main_win.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: Install .NET 6 SDK - win_chocolatey: - name: dotnet-6.0-sdk From 9baa83493ad190eb2f301fcd474bc808cc338329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Wed, 7 Aug 2024 23:04:21 +0200 Subject: [PATCH 10/12] Bump octave version --- roles/octave/tasks/main_win.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/octave/tasks/main_win.yml b/roles/octave/tasks/main_win.yml index cf4f93c..50698f9 100644 --- a/roles/octave/tasks/main_win.yml +++ b/roles/octave/tasks/main_win.yml @@ -1,10 +1,11 @@ # chocolatey package is broken - name: Set Octave version set_fact: - target_version: "7.2.0" + target_version: "9.2.0" - name: Install Octave win_package: - path: https://ftpmirror.gnu.org/octave/windows/octave-{{ target_version }}-w64-installer.exe + # path: https://ftpmirror.gnu.org/octave/windows/octave-{{ target_version }}-w64-installer.exe + path: https://mirror.us-midwest-1.nexcess.net/gnu/octave/windows/octave-{{ target_version }}-w64-installer.exe arguments: /S /AllUsers creates_path: C:\Program Files\GNU Octave\Octave-{{ target_version }} From 6f6643a0e55bc7e1e1dbf36787c16ec371ab62ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Tue, 20 Aug 2024 11:13:11 +0200 Subject: [PATCH 11/12] Bump Matlab version --- roles/matlab/tasks/main_lin.yml | 2 +- roles/matlab/tasks/main_win.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/matlab/tasks/main_lin.yml b/roles/matlab/tasks/main_lin.yml index 6d0e0dc..200fd19 100644 --- a/roles/matlab/tasks/main_lin.yml +++ b/roles/matlab/tasks/main_lin.yml @@ -1,6 +1,6 @@ - name: Set Matlab version and destination set_fact: - target_version: "R2023b" + target_version: "R2024a_Update_5" install_dir: "/mnt/ucilnice_d/install/matlab/" license_path: "/mnt/ucilnice_d/install/matlab/network.lic" dest_dir: /opt/matlab diff --git a/roles/matlab/tasks/main_win.yml b/roles/matlab/tasks/main_win.yml index b448182..5aca958 100644 --- a/roles/matlab/tasks/main_win.yml +++ b/roles/matlab/tasks/main_win.yml @@ -1,12 +1,12 @@ - name: Set Matlab version and destination set_fact: - target_version: "r2023b" + target_version: "R2024a_Update_5" license_path: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install\matlab\network.lic dest_dir: D:\matlab - name: Mount Matlab ISO win_disk_image: - image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso" + image_path: "{{ installers }}\\matlab\\{{ target_version }}_Windows.iso" state: present register: disk_image From 7bc78918370805c004a9b2b38516869700a5e68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Sat, 24 Aug 2024 14:56:10 +0200 Subject: [PATCH 12/12] Add vars include to linroom, winroom --- linsetup.yml | 10 +++++++--- roles/BMO-63259/meta/main.yml | 2 +- roles/PA-63737/meta/main.yml | 2 +- roles/twincat3/meta/main.yml | 4 ++++ roles/twincat3/tasks/main.yml | 4 ++++ roles/twincat3/tasks/main_lin.yml | 2 ++ roles/twincat3/tasks/main_win.yml | 5 +++++ roles/visualstudio19/tasks/main.yml | 4 ++++ roles/visualstudio19/tasks/main_lin.yml | 2 ++ roles/visualstudio19/tasks/main_win.yml | 5 +++++ winsetup.yml | 12 +++++++++++- 11 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 roles/twincat3/meta/main.yml create mode 100644 roles/twincat3/tasks/main.yml create mode 100644 roles/twincat3/tasks/main_lin.yml create mode 100644 roles/twincat3/tasks/main_win.yml create mode 100644 roles/visualstudio19/tasks/main.yml create mode 100644 roles/visualstudio19/tasks/main_lin.yml create mode 100644 roles/visualstudio19/tasks/main_win.yml diff --git a/linsetup.yml b/linsetup.yml index b99b561..071f086 100644 --- a/linsetup.yml +++ b/linsetup.yml @@ -3,8 +3,12 @@ become: true vars: ansible_port: 1001 - ansible_become_pass: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' - ansible_password: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' + # ansible_become_pass: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' + # ansible_password: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' ansible_connection: 'ssh' + vars_files: + - vars/credentials.yml + - vars/software_keys.yml roles: - - all_classes + # - all_classes + - fri_base diff --git a/roles/BMO-63259/meta/main.yml b/roles/BMO-63259/meta/main.yml index 31928ec..8a62826 100644 --- a/roles/BMO-63259/meta/main.yml +++ b/roles/BMO-63259/meta/main.yml @@ -3,4 +3,4 @@ # Windows, VMware Workstation 16.2.4 Player, wireshark dependencies: - role: wireshark - - role: vmware_player + - role: virtualbox diff --git a/roles/PA-63737/meta/main.yml b/roles/PA-63737/meta/main.yml index f42edd6..e81f483 100644 --- a/roles/PA-63737/meta/main.yml +++ b/roles/PA-63737/meta/main.yml @@ -2,4 +2,4 @@ # Nejc.Ilc@fri.uni-lj.si # Windows, VMware Workstation 16.2.4 Player dependencies: - - role: vmware_player + - role: twincat3 diff --git a/roles/twincat3/meta/main.yml b/roles/twincat3/meta/main.yml new file mode 100644 index 0000000..3d28cc7 --- /dev/null +++ b/roles/twincat3/meta/main.yml @@ -0,0 +1,4 @@ +# dependencies: +# - role: fri_base +dependencies: + - role: visualstudio19 diff --git a/roles/twincat3/tasks/main.yml b/roles/twincat3/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/twincat3/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/twincat3/tasks/main_lin.yml b/roles/twincat3/tasks/main_lin.yml new file mode 100644 index 0000000..996ec5c --- /dev/null +++ b/roles/twincat3/tasks/main_lin.yml @@ -0,0 +1,2 @@ +- name: Do not install TwinCat 3 on Linux + debug: Do not install TwinCat 3 on Linux diff --git a/roles/twincat3/tasks/main_win.yml b/roles/twincat3/tasks/main_win.yml new file mode 100644 index 0000000..c2ec314 --- /dev/null +++ b/roles/twincat3/tasks/main_win.yml @@ -0,0 +1,5 @@ +- name: Install TwinCat 3 + win_chocolatey: + name: visualstudio2019community + +# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version diff --git a/roles/visualstudio19/tasks/main.yml b/roles/visualstudio19/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/visualstudio19/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/visualstudio19/tasks/main_lin.yml b/roles/visualstudio19/tasks/main_lin.yml new file mode 100644 index 0000000..54a5121 --- /dev/null +++ b/roles/visualstudio19/tasks/main_lin.yml @@ -0,0 +1,2 @@ +- name: Do not install VisualStudio on Linux + debug: Do not install VisualStudio on Linux diff --git a/roles/visualstudio19/tasks/main_win.yml b/roles/visualstudio19/tasks/main_win.yml new file mode 100644 index 0000000..ef292c4 --- /dev/null +++ b/roles/visualstudio19/tasks/main_win.yml @@ -0,0 +1,5 @@ +- name: Install Microsoft Visual Studio 2019 + win_chocolatey: + name: visualstudio2019community + +# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version diff --git a/winsetup.yml b/winsetup.yml index 0226c6d..e6091ec 100644 --- a/winsetup.yml +++ b/winsetup.yml @@ -1,6 +1,7 @@ - hosts: classroom become: true become_method: runas + debugger: on_failed vars: ansible_connection: winrm ansible_winrm_transport: ntlm @@ -8,6 +9,15 @@ ansible_port: 5985 logon_type: interactive installers: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install + vars_files: + - vars/credentials.yml + - vars/software_keys.yml roles: - - all_classes + # - fri_base + - matlab + # - all_classes + # - android_studio + # - octave + # - audacity + # - vmware_player