Skip to content

Commit 8867bd3

Browse files
authored
Fix ci issue (#111)
* Fix ci issue * fix ci
1 parent bbaf82e commit 8867bd3

File tree

25 files changed

+39
-42
lines changed

25 files changed

+39
-42
lines changed

.ansible-lint

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
exclude_paths:
33
- .cache/ # implicit unless exclude_paths is defined in config
44
- .github/
5+
- requirements.yml
56
- src/**/cookiecutter/{{*
67
# - src/molecule_gce/cookiecutter/{{cookiecutter.molecule_directory}}
78

89
skip_list:
910
# Temporary skips made during migration
11+
- args[module]
1012
- fqcn-builtins
1113
- yaml[line-length]
1214
- var-spacing

molecule/test-podman/verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
- name: Verify
55
hosts: all
66
tasks:
7-
- name: Example assertion
8-
ansible.builtin.assert:
9-
that: true
7+
- name: Example assertion
8+
ansible.builtin.assert:
9+
that: true

src/molecule_plugins/docker/playbooks/validate-dockerfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
ansible.builtin.template:
3232
src: Dockerfile.j2
3333
dest: "{{ temp_dockerfiles.results[index].path }}"
34-
mode: 0600
34+
mode: "0600"
3535
register: result
3636
with_items: "{{ platforms }}"
3737
loop_control:
@@ -59,7 +59,7 @@
5959
ansible.builtin.file:
6060
path: "{{ item }}"
6161
state: absent
62-
mode: 0600
62+
mode: "0600"
6363
loop: "{{ temp_dockerfiles.results | map(attribute='path') | list }}"
6464

6565
- name: Display results

src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
- name: create ssh keypair
2+
- name: Create ssh keypair
33
community.crypto.openssh_keypair:
44
comment: "{{ lookup('env','USER') }} user for Molecule"
55
path: "{{ ssh_identity_file }}"
66
register: keypair
77

8-
- name: create molecule Linux instance(s)
8+
- name: Create molecule Linux instance(s)
99
google.cloud.gcp_compute_instance:
1010
state: present
1111
name: "{{ item.name }}"

src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: create molecule Windows instance(s)
2+
- name: Create molecule Windows instance(s)
33
google.cloud.gcp_compute_instance:
44
state: present
55
name: "{{ item.name }}"

src/molecule_plugins/podman/driver.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ def sanity_checks(self):
224224
# fully adopts ansible-compat
225225
runtime = Runtime()
226226
if runtime.version < Version("2.10.0"):
227-
228227
if runtime.config.ansible_pipelining:
229228
sysexit_with_message(
230229
"Podman connections do not work with Ansible "

src/molecule_plugins/podman/playbooks/create.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
- item.registry is defined
4040
- item.registry.credentials is defined
4141
- item.registry.credentials.username is defined
42+
changed_when: false
4243

4344
- name: Check presence of custom Dockerfiles
4445
ansible.builtin.stat:
@@ -97,6 +98,7 @@
9798
retries: 3
9899
delay: 30
99100
no_log: false
101+
changed_when: false
100102

101103
- name: Determine the CMD directives
102104
ansible.builtin.set_fact:

src/molecule_plugins/podman/playbooks/validate-dockerfile.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
hosts: localhost
55
connection: local
66
gather_facts: false
7-
collections:
8-
- containers.podman
97
vars:
108
platforms:
119
# platforms supported as being managed by molecule/ansible, this does
@@ -30,7 +28,7 @@
3028
ansible.builtin.template:
3129
src: Dockerfile.j2
3230
dest: "{{ temp_image_dirs.results[index].path }}/Dockerfile"
33-
mode: 0600
31+
mode: "0600"
3432
register: result
3533
with_items: "{{ platforms }}"
3634
loop_control:

src/molecule_plugins/vagrant/modules/vagrant.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,6 @@ def _get_vagrant(self):
586586
return v
587587

588588
def _get_instance_vagrant_config_dict(self, instance):
589-
590589
checksum = instance.get("box_download_checksum")
591590
checksum_type = instance.get("box_download_checksum_type")
592591
if bool(checksum) ^ bool(checksum_type):

src/molecule_plugins/vagrant/playbooks/create.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@
4545
ansible.builtin.copy:
4646
content: "{{ instance_conf | to_json | from_json | to_yaml }}"
4747
dest: "{{ molecule_instance_config }}"
48-
mode: 0600
48+
mode: "0600"

0 commit comments

Comments
 (0)