Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
bbaassssiiee committed Nov 21, 2022
1 parent 4b52cbb commit 257d701
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
skip_list:
- '306' # Shells that use pipes should set the pipefail option
- experimental # all rules tagged as experimental
- fqcn-builtins
4 changes: 2 additions & 2 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: "${{ github.repository }}"
- name: molecule
Expand All @@ -27,7 +27,7 @@ jobs:
fail-fast: false
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: "${{ github.repository }}"
- name: molecule
Expand Down
4 changes: 2 additions & 2 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ extends: default

rules:
truthy:
allowed-values: ['true', 'false', 'on']
check-keys: true
allowed-values: ['true', 'false']
check-keys: false

ignore: |
.tox/
3 changes: 1 addition & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ lint: |
set -e
yamllint .
ansible-lint
ansible-later
platforms:
- name: base-nettime-centos7
image: centos:7
image: centos:7.9.2009
command: /sbin/init
capabilities:
- CAP_SYS_TIME
Expand Down
6 changes: 3 additions & 3 deletions molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
goss_arch: amd64
goss_dst: /usr/local/bin/goss
# yamllint disable-line rule:line-length
goss_sha256sum: 'sha256:357f5c7f2e7949b412bce44349cd32ab19eb3947255a8ac805f884cc2c326059'
goss_sha256sum: '357f5c7f2e7949b412bce44349cd32ab19eb3947255a8ac805f884cc2c326059'
# yamllint disable-line rule:line-length
goss_url: "https://github.com/aelsabbahy/goss/releases/download/{{ goss_version }}/goss-linux-{{ goss_arch }}"
goss_test_directory: /etc/goss.d
Expand All @@ -21,7 +21,7 @@
ansible.builtin.get_url:
url: "{{ goss_url }}"
dest: "{{ goss_dst }}"
checksum: "{{ goss_sha256sum }}"
checksum: "sha256:{{ goss_sha256sum }}"
mode: 0755
register: download_goss
until: download_goss is succeeded
Expand All @@ -35,7 +35,7 @@
- name: Execute Goss tests
environment:
# yamllint disable-line rule:line-length
PATH: '/opt/rh/rh-git218/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
PATH: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
# yamllint disable-line rule:line-length
ansible.builtin.command: "{{ goss_dst }} -g {{ item }} validate -f {{ goss_format }}"
changed_when: false
Expand Down
19 changes: 12 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# these python extensions are for testing
tox
pipx
attrs>=19.2.0
sh==1.12.14
ansible==2.9.27
molecule==3.2.3
molecule-docker
yamllint==1.26.3
ansible-lint==4.3.7
ansible-later==1.4.0
rich==12.5.1
ansible==6.2.0
ansible-lint==6.4.0
molecule==4.0.1
molecule-docker==2.0.0
molecule-vagrant-1.0.0
yamllint==1.28.0
docker>=4.3.1
ssh-audit
anyconfig>=0.10.0 # not directly required, pinned by Snyk to avoid a vulnerability
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

0 comments on commit 257d701

Please sign in to comment.