Skip to content

Commit

Permalink
Test 3 at the same time, update README
Browse files Browse the repository at this point in the history
  • Loading branch information
x86-39 committed Nov 6, 2023
1 parent 4324abc commit 558e028
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 39 deletions.
6 changes: 3 additions & 3 deletions roles/android_studio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ These platforms are supported:
- EL 8 (Tested on Rocky Linux 8)
- EL 9 (Tested on Rocky Linux 9)
- Fedora 38
- openSUSE Leap 15.4
- openSUSE Leap 15.5

<!--
- List hardware requirements here
Expand Down Expand Up @@ -47,10 +47,10 @@ Example Playbook
----------------

```yaml
- name: Use diademiemi.android_studio role
- name: Use diademiemi.jetbrains.android_studio role
hosts: "{{ target | default('android_studio') }}"
roles:
- role: "diademiemi.android_studio"
- role: "diademiemi.jetbrains.android_studio"
tags: ['diademiemi', 'android_studio', 'setup'] ```

```
Expand Down
4 changes: 2 additions & 2 deletions roles/android_studio/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: all
gather_facts: true
serial: 5
serial: 3
pre_tasks:
# Prevent Apt cache errors
- name: "Refresh Apt cache"
Expand All @@ -25,7 +25,7 @@
failed_when: false

tasks:
- name: "Include diademiemi.android_studio"
- name: "Include diademiemi.jetbrains.android_studio"
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

Expand Down
4 changes: 2 additions & 2 deletions roles/android_studio/tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Run diademiemi.android_studio on localhost
- name: Run diademiemi.jetbrains.android_studio on localhost
hosts: localhost
tasks:
- name: "Ensure temporary roles directory exists"
Expand All @@ -12,7 +12,7 @@
src: "{{ lookup('env', 'PWD') }}"
dest: "~/.ansible/roles/{{ lookup('env', 'PWD') | basename }}"
state: link
- name: "Include diademiemi.android_studio"
- name: "Include diademiemi.jetbrains.android_studio"
ansible.builtin.include_role:
name: "{{ lookup('env', 'PWD') | basename }}"
- name: "Remove temporary symlink in roles directory"
Expand Down
6 changes: 3 additions & 3 deletions roles/clion/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ These platforms are supported:
- EL 8 (Tested on Rocky Linux 8)
- EL 9 (Tested on Rocky Linux 9)
- Fedora 38
- openSUSE Leap 15.4
- openSUSE Leap 15.5

<!--
- List hardware requirements here
Expand Down Expand Up @@ -50,10 +50,10 @@ Example Playbook
----------------

```yaml
- name: Use diademiemi.clion role
- name: Use diademiemi.jetbrains.clion role
hosts: "{{ target | default('clion') }}"
roles:
- role: "diademiemi.clion"
- role: "diademiemi.jetbrains.clion"
tags: ['diademiemi', 'clion', 'setup'] ```

```
Expand Down
4 changes: 2 additions & 2 deletions roles/clion/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: all
gather_facts: true
serial: 5
serial: 3
pre_tasks:
# Prevent Apt cache errors
- name: "Refresh Apt cache"
Expand All @@ -25,7 +25,7 @@
failed_when: false

tasks:
- name: "Include diademiemi.clion"
- name: "Include diademiemi.jetbrains.clion"
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

Expand Down
4 changes: 2 additions & 2 deletions roles/clion/tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Run diademiemi.clion on localhost
- name: Run diademiemi.jetbrains.clion on localhost
hosts: localhost
tasks:
- name: "Ensure temporary roles directory exists"
Expand All @@ -12,7 +12,7 @@
src: "{{ lookup('env', 'PWD') }}"
dest: "~/.ansible/roles/{{ lookup('env', 'PWD') | basename }}"
state: link
- name: "Include diademiemi.clion"
- name: "Include diademiemi.jetbrains.clion"
ansible.builtin.include_role:
name: "{{ lookup('env', 'PWD') | basename }}"
- name: "Remove temporary symlink in roles directory"
Expand Down
2 changes: 1 addition & 1 deletion roles/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ These platforms are supported:
- EL 8 (Tested on Rocky Linux 8)
- EL 9 (Tested on Rocky Linux 9)
- Fedora 38
- openSUSE Leap 15.4
- openSUSE Leap 15.5

<!--
- List hardware requirements here
Expand Down
12 changes: 9 additions & 3 deletions roles/common/tasks/setup/always.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,22 @@
path: "/opt/{{ jetbrains_common_name }}"
state: absent

- name: Move temporary directory to permanent location
- name: Copy temporary directory to permanent location
become: true
ansible.builtin.file:
ansible.builtin.copy:
src: "/tmp/{{ jetbrains_common_name }}{{ jetbrains_common_edition }}-{{ jetbrains_common_version }}"
dest: "/opt/{{ jetbrains_common_name }}"
state: directory
remote_src: true
mode: "0755"
owner: root
group: root

- name: Remove temporary directory
become: true
ansible.builtin.file:
path: "/tmp/{{ jetbrains_common_name }}{{ jetbrains_common_edition }}-{{ jetbrains_common_version }}"
state: absent

- name: Perform new install
when: not jetbrains_common_product_info.stat.exists
block:
Expand Down
6 changes: 3 additions & 3 deletions roles/goland/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ These platforms are supported:
- EL 8 (Tested on Rocky Linux 8)
- EL 9 (Tested on Rocky Linux 9)
- Fedora 38
- openSUSE Leap 15.4
- openSUSE Leap 15.5

<!--
- List hardware requirements here
Expand All @@ -43,10 +43,10 @@ Example Playbook
----------------

```yaml
- name: Use diademiemi.goland role
- name: Use diademiemi.jetbrains.goland role
hosts: "{{ target | default('goland') }}"
roles:
- role: "diademiemi.goland"
- role: "diademiemi.jetbrains.goland"
tags: ['diademiemi', 'goland', 'setup'] ```

```
Expand Down
4 changes: 2 additions & 2 deletions roles/goland/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: all
gather_facts: true
serial: 5
serial: 3
pre_tasks:
# Prevent Apt cache errors
- name: "Refresh Apt cache"
Expand All @@ -25,7 +25,7 @@
failed_when: false

tasks:
- name: "Include diademiemi.goland"
- name: "Include diademiemi.jetbrains.goland"
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

Expand Down
4 changes: 2 additions & 2 deletions roles/goland/tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Run diademiemi.goland on localhost
- name: Run diademiemi.jetbrains.goland on localhost
hosts: localhost
tasks:
- name: "Ensure temporary roles directory exists"
Expand All @@ -12,7 +12,7 @@
src: "{{ lookup('env', 'PWD') }}"
dest: "~/.ansible/roles/{{ lookup('env', 'PWD') | basename }}"
state: link
- name: "Include diademiemi.goland"
- name: "Include diademiemi.jetbrains.goland"
ansible.builtin.include_role:
name: "{{ lookup('env', 'PWD') | basename }}"
- name: "Remove temporary symlink in roles directory"
Expand Down
6 changes: 3 additions & 3 deletions roles/idea/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ These platforms are supported:
- EL 8 (Tested on Rocky Linux 8)
- EL 9 (Tested on Rocky Linux 9)
- Fedora 38
- openSUSE Leap 15.4
- openSUSE Leap 15.5

<!--
- List hardware requirements here
Expand Down Expand Up @@ -48,10 +48,10 @@ Example Playbook
----------------

```yaml
- name: Use diademiemi.idea role
- name: Use diademiemi.jetbrains.idea role
hosts: "{{ target | default('idea') }}"
roles:
- role: "diademiemi.idea"
- role: "diademiemi.jetbrains.idea"
tags: ['diademiemi', 'idea', 'setup'] ```

```
Expand Down
4 changes: 2 additions & 2 deletions roles/idea/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: all
gather_facts: true
serial: 5
serial: 3
pre_tasks:
# Prevent Apt cache errors
- name: "Refresh Apt cache"
Expand All @@ -25,7 +25,7 @@
failed_when: false

tasks:
- name: "Include diademiemi.idea"
- name: "Include diademiemi.jetbrains.idea"
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

Expand Down
4 changes: 2 additions & 2 deletions roles/idea/tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Run diademiemi.idea on localhost
- name: Run diademiemi.jetbrains.idea on localhost
hosts: localhost
tasks:
- name: "Ensure temporary roles directory exists"
Expand All @@ -12,7 +12,7 @@
src: "{{ lookup('env', 'PWD') }}"
dest: "~/.ansible/roles/{{ lookup('env', 'PWD') | basename }}"
state: link
- name: "Include diademiemi.idea"
- name: "Include diademiemi.jetbrains.idea"
ansible.builtin.include_role:
name: "{{ lookup('env', 'PWD') | basename }}"
- name: "Remove temporary symlink in roles directory"
Expand Down
6 changes: 3 additions & 3 deletions roles/pycharm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ These platforms are supported:
- EL 8 (Tested on Rocky Linux 8)
- EL 9 (Tested on Rocky Linux 9)
- Fedora 38
- openSUSE Leap 15.4
- openSUSE Leap 15.5

<!--
- List hardware requirements here
Expand Down Expand Up @@ -50,10 +50,10 @@ Example Playbook
----------------

```yaml
- name: Use diademiemi.pycharm role
- name: Use diademiemi.jetbrains.pycharm role
hosts: "{{ target | default('pycharm') }}"
roles:
- role: "diademiemi.pycharm"
- role: "diademiemi.jetbrains.pycharm"
tags: ['diademiemi', 'pycharm', 'setup'] ```

```
Expand Down
4 changes: 2 additions & 2 deletions roles/pycharm/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Converge
hosts: all
gather_facts: true
serial: 5
serial: 3
pre_tasks:
# Prevent Apt cache errors
- name: "Refresh Apt cache"
Expand All @@ -25,7 +25,7 @@
failed_when: false

tasks:
- name: "Include diademiemi.pycharm"
- name: "Include diademiemi.jetbrains.pycharm"
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

Expand Down
4 changes: 2 additions & 2 deletions roles/pycharm/tests/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Run diademiemi.pycharm on localhost
- name: Run diademiemi.jetbrains.pycharm on localhost
hosts: localhost
tasks:
- name: "Ensure temporary roles directory exists"
Expand All @@ -12,7 +12,7 @@
src: "{{ lookup('env', 'PWD') }}"
dest: "~/.ansible/roles/{{ lookup('env', 'PWD') | basename }}"
state: link
- name: "Include diademiemi.pycharm"
- name: "Include diademiemi.jetbrains.pycharm"
ansible.builtin.include_role:
name: "{{ lookup('env', 'PWD') | basename }}"
- name: "Remove temporary symlink in roles directory"
Expand Down

0 comments on commit 558e028

Please sign in to comment.