Skip to content

Commit 5aa82a6

Browse files
rockdreamerrockdreamer
committed
Lint role BLD-5736
1 parent dc4b8c6 commit 5aa82a6

12 files changed

+201
-114
lines changed

‎.editorconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at http://editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
indent_size = 4
9+
end_of_line = lf
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[*.yml]
14+
indent_style = space
15+
indent_size = 2

‎.github/workflows/common_ccdc_status_checks.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# This status check is updated on all repositories by the moan.py script
23
# in the github-repository-management repository.
34
# Changes in this file will be overwritten periodically.

‎.github/workflows/lint-ansible-role.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Lint
3+
4+
on: [pull_request]
5+
6+
jobs:
7+
lint:
8+
name: Linting
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Setup Python
15+
uses: actions/setup-python@v1
16+
with:
17+
python-version: 3.9
18+
architecture: x64
19+
20+
- name: Checkout
21+
uses: actions/checkout@main
22+
23+
- name: Install linters
24+
run: pip install ansible ansible-lint yamllint
25+
26+
- name: Run ansible-lint
27+
run: "ansible-lint ."
28+
29+
- name: Run yamllint
30+
run: "yamllint ."

‎.yamllint.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# -*- mode: yaml -*-
2+
# vim:ts=2:sw=2:ai:si:syntax=yaml
3+
#
4+
# yamllint configuration directives
5+
# Project Homepage: https://github.com/adrienverge/yamllint
6+
#
7+
# Overriding rules in files:
8+
# http://yamllint.readthedocs.io/en/latest/disable_with_comments.html
9+
---
10+
extends: default
11+
12+
# Rules documentation: http://yamllint.readthedocs.io/en/latest/rules.html
13+
rules:
14+
15+
braces:
16+
# Defaults
17+
# min-spaces-inside: 0
18+
# max-spaces-inside: 0
19+
20+
# Keeping 0 min-spaces to not error on empty collection definitions
21+
min-spaces-inside: 0
22+
# Allowing one space inside braces to improve code readability
23+
max-spaces-inside: 1
24+
25+
brackets:
26+
# Defaults
27+
# min-spaces-inside: 0
28+
# max-spaces-inside: 0
29+
30+
# Keeping 0 min-spaces to not error on empty collection definitions
31+
min-spaces-inside: 0
32+
# Allowing one space inside braces to improve code readability
33+
max-spaces-inside: 1
34+
35+
comments:
36+
# Defaults
37+
# level: warning
38+
# require-starting-space: true
39+
40+
# Disabling to allow for code comment blocks and #!/usr/bin/ansible-playbook
41+
require-starting-space: false
42+
min-spaces-from-content: 1
43+
44+
indentation:
45+
# Defaults
46+
# spaces: consistent
47+
# indent-sequences: true
48+
# check-multi-line-strings: false
49+
50+
# Requiring 2 space indentation
51+
spaces: 2
52+
# Requiring consistent indentation within a file, either indented or not
53+
indent-sequences: consistent
54+
55+
# Disabling due to copious amounts of long lines in the code which would
56+
# require a code style change to resolve
57+
line-length:
58+
# Defaults
59+
max: 160
60+
61+
# Disabling due to become: true being used pervasively in roles
62+
truthy: disable

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ geerlingguy.homebrew, used on MacOS to initialise the HomeBrew package manager
88

99
## Role Variables
1010

11-
None, this is specific to CCDC
11+
- ansible_deployment_artifactory_user: artifactory user with read only access to mirrors
12+
- ansible_deployment_artifactory_key: api key for above user
1213

1314
## Dependencies
1415

@@ -26,4 +27,4 @@ MIT / BSD
2627

2728
## Author Information
2829

29-
This role was created in 2020 by Claudio Bantaloukas, based on existing roles at CCDC, by Jeff Geerling and google searches
30+
This role was created in 2020 by Claudio Bantaloukas, based on existing roles at CCDC, by Jeff Geerling and google searches

‎defaults/main.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
chocolatey_mirror_username: "{{ ansible_deployment_artifactory_user }}"
3+
chocolatey_mirror_password: "{{ ansible_deployment_artifactory_key }}"

‎meta/main.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ dependencies: []
33

44
galaxy_info:
55
role_name: package_manager_configuration
6-
author: cbantaloukas
6+
namespace: ccdc
7+
author: rockdreamer
78
description: Set up package managers and CCDC artifactory repositories.
89
company: The Cambridge Crystallographic Data Centre
910
license: "license (BSD, MIT)"
@@ -21,7 +22,7 @@ galaxy_info:
2122
- name: Ubuntu
2223
versions:
2324
- all
24-
- name: Darwin
25+
- name: MacOSX
2526
versions:
2627
- all
2728
- name: Windows

‎tasks/CentOS-7.yml

+37-48
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,41 @@
11
---
2-
# Modern clang on centos7? Why not!
3-
- name: Add llvm-toolset-10 repository from cloudlinux
4-
yum_repository:
5-
name: cloudlinux-llvm-toolset-10.0
6-
description: llvm-toolset-10 repository from cloudlinux
7-
# mirror of https://repo.cloudlinux.com/cloudlinux/7/sclo/llvm-toolset-10.0
8-
baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-cloudlinux-llvm-toolset-10.0/
9-
gpgcheck: no
10-
username: "{{ansible_deployment_artifactory_user}}"
11-
password: "{{ansible_deployment_artifactory_key}}"
12-
become: yes
2+
# Modern clang on centos7? Why not!
3+
- name: Add llvm-toolset-10 repository from cloudlinux
4+
yum_repository:
5+
name: cloudlinux-llvm-toolset-10.0
6+
description: llvm-toolset-10 repository from cloudlinux
7+
# mirror of https://repo.cloudlinux.com/cloudlinux/7/sclo/llvm-toolset-10.0
8+
baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-cloudlinux-llvm-toolset-10.0/
9+
gpgcheck: no
10+
username: "{{ ansible_deployment_artifactory_user }}"
11+
password: "{{ ansible_deployment_artifactory_key }}"
12+
become: true
1313

14-
- name: Add oracle linux 7's ol7_software_collections repository
15-
yum_repository:
16-
name: ol7_software_collections
17-
description: ol7_software_collections
18-
# mirror of http://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/x86_64/
19-
baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-ol7-scl/
20-
gpgcheck: no
21-
username: "{{ansible_deployment_artifactory_user}}"
22-
password: "{{ansible_deployment_artifactory_key}}"
23-
become: yes
14+
- name: Add oracle linux 7's ol7_software_collections repository
15+
yum_repository:
16+
name: ol7_software_collections
17+
description: ol7_software_collections
18+
# mirror of http://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/x86_64/
19+
baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-ol7-scl/
20+
gpgcheck: no
21+
username: "{{ ansible_deployment_artifactory_user }}"
22+
password: "{{ ansible_deployment_artifactory_key }}"
23+
become: true
2424

25-
- name: Add EPEL repository from artifactory
26-
yum_repository:
27-
name: epel
28-
description: EPEL YUM repo
29-
baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-epel-7-mirror/
30-
gpgkey: https://artifactory.ccdc.cam.ac.uk/artifactory/ccdc-3rd-party-sources/RPM-GPG-KEY-EPEL-7
31-
username: "{{ansible_deployment_artifactory_user}}"
32-
password: "{{ansible_deployment_artifactory_key}}"
33-
become: yes
25+
- name: Add EPEL repository from artifactory
26+
yum_repository:
27+
name: epel
28+
description: EPEL YUM repo
29+
baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-epel-7-mirror/
30+
gpgkey: https://artifactory.ccdc.cam.ac.uk/artifactory/ccdc-3rd-party-sources/RPM-GPG-KEY-EPEL-7
31+
username: "{{ ansible_deployment_artifactory_user }}"
32+
password: "{{ ansible_deployment_artifactory_key }}"
33+
become: true
3434

35-
# Centos7 provides an extremely old mercurial
36-
- name: Add Mercurial repository
37-
yum_repository:
38-
name: mercurial.selenic.com
39-
description: mercurial YUM repo
40-
baseurl: https://www.mercurial-scm.org/release/centos7/
41-
# Artifactory mirror is not working with an https range error
42-
# baseurl: https://artifactory.ccdc.cam.ac.uk/artifactory/public-mercurial-centos-7-mirror/
43-
gpgcheck: no
44-
become: yes
45-
46-
# Centos7 requires the scl package to enable fetching packages from software collections
47-
- name: Install software collections
48-
package:
49-
name:
50-
- centos-release-scl
51-
state: latest
52-
become: yes
35+
# Centos7 requires the scl package to enable fetching packages from software collections
36+
- name: Install software collections
37+
package:
38+
name:
39+
- centos-release-scl
40+
state: present
41+
become: true

‎tasks/CentOS-8.yml

+7-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
---
2-
# We have no artifactory EPEL mirror for CentOS 8 so we'll just install the distribution's own
3-
- name: Enable EPEL
4-
package:
5-
name:
6-
- epel-release
7-
state: latest
8-
become: yes
9-
10-
# There is no Ansible module for managing DNF repos on CentOS 8 so we need to do this manually
11-
- name: Add Mercurial repository
12-
ini_file:
13-
path: /etc/yum.repos.d/mercurial-scm.org_release_centos8_.repo
14-
section: "mercurial-scm.org_release_centos8_"
15-
option: "{{ option.name }}"
16-
value: "{{ option.value }}"
17-
loop:
18-
- { "name": "baseurl", "value": "https://www.mercurial-scm.org/release/centos8/" }
19-
- { "name": "enabled", "value": "1" }
20-
- { "name": "name", "value": "Mercurial CentOS 8 Repository" }
21-
loop_control:
22-
loop_var: option
23-
become: yes
2+
# We have no artifactory EPEL mirror for CentOS 8 so we'll just install the distribution's own
3+
- name: Enable EPEL
4+
package:
5+
name:
6+
- epel-release
7+
state: present
8+
become: true

‎tasks/Darwin.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
X-JFrog-Art-Api: "{{ ansible_deployment_artifactory_key }}"
1616
when: clt_pkg_info.rc != 0
1717

18-
- command: mkdir -p /Users/vagrant/Downloads/clt
18+
- name: Create temporary download directory for command line tools
19+
command: mkdir -p /Users/vagrant/Downloads/clt # noqa: deprecated-command-syntax
1920
when: clt_pkg_info.rc != 0
2021

2122
- name: "Mount command line tools dmg"
@@ -36,7 +37,7 @@
3637
when: clt_pkg_info.rc != 0
3738

3839
- name: "Remove command line tools dmg mountpoint"
39-
command: rm -R /Users/vagrant/Downloads/clt
40+
command: rm -R /Users/vagrant/Downloads/clt # noqa: deprecated-command-syntax
4041
when: clt_pkg_info.rc != 0
4142

4243
- name: install homebrew

‎tasks/Windows.yml

+26-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
---
2-
- name: ensure Chocolatey is installed
3-
win_chocolatey:
4-
name: chocolatey
5-
state: present
2+
- name: Ensure Chocolatey is installed
3+
win_chocolatey:
4+
name: chocolatey
5+
state: present
66

7-
- name: remove the default public chocolatey source
8-
win_chocolatey_source:
9-
name: chocolatey
10-
state: absent
7+
- name: remove the default public chocolatey source
8+
win_chocolatey_source:
9+
name: chocolatey
10+
state: absent
1111

12-
- name: remove previous source
13-
win_chocolatey_source:
14-
name: ccdc chocolatey mirror
15-
state: absent
12+
- name: remove previous source
13+
win_chocolatey_source:
14+
name: ccdc chocolatey mirror
15+
state: absent
1616

17-
- name: add ccdc artifactory chocolatey source
18-
win_chocolatey_source:
19-
name: artifactory-mirror
20-
state: present
21-
source: https://artifactory.ccdc.cam.ac.uk/artifactory/api/nuget/public-chocolatey
22-
source_username: "{{ansible_deployment_artifactory_user}}"
23-
source_password: "{{ansible_deployment_artifactory_key}}"
24-
25-
- name: add ccdc artifactory chocolatey source for internal packages
26-
win_chocolatey_source:
27-
name: ccdc-chocolatey
28-
state: present
29-
source: https://artifactory.ccdc.cam.ac.uk/artifactory/api/nuget/ccdc-chocolatey
30-
source_username: "{{ansible_deployment_artifactory_user}}"
31-
source_password: "{{ansible_deployment_artifactory_key}}"
17+
- name: add ccdc artifactory chocolatey source
18+
win_chocolatey_source:
19+
name: artifactory-mirror
20+
state: present
21+
source: https://artifactory.ccdc.cam.ac.uk/artifactory/api/nuget/public-chocolatey
22+
source_username: "{{ chocolatey_mirror_username }}"
23+
source_password: "{{ chocolatey_mirror_password }}"
3224

25+
- name: add ccdc artifactory chocolatey source for internal packages
26+
win_chocolatey_source:
27+
name: ccdc-chocolatey
28+
state: present
29+
source: https://artifactory.ccdc.cam.ac.uk/artifactory/api/nuget/ccdc-chocolatey
30+
source_username: "{{ chocolatey_mirror_username }}"
31+
source_password: "{{ chocolatey_mirror_password }}"

‎tasks/main.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
- name: Install and set up package managers
3-
include_tasks: "{{ taskfile }}"
4-
with_first_found:
5-
- files:
6-
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
7-
- "{{ ansible_distribution }}.yml"
8-
- "{{ ansible_os_family }}.yml"
9-
- "{{ ansible_system }}.yml"
10-
skip: true
11-
loop_control:
12-
loop_var: taskfile
2+
- name: Install and set up package managers
3+
include_tasks: "{{ taskfile }}"
4+
with_first_found:
5+
- files:
6+
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
7+
- "{{ ansible_distribution }}.yml"
8+
- "{{ ansible_os_family }}.yml"
9+
- "{{ ansible_system }}.yml"
10+
skip: true
11+
loop_control:
12+
loop_var: taskfile

0 commit comments

Comments
 (0)