diff --git a/ansible-lint/YAMLdictchecker.py b/ansible-lint/YAMLdictchecker.py index cc1acd63..701280d8 100755 --- a/ansible-lint/YAMLdictchecker.py +++ b/ansible-lint/YAMLdictchecker.py @@ -29,7 +29,7 @@ class YAMLdictchecker(ansiblelint.AnsibleLintRule): tags = ['task'] def match(self, file, line): - for l in line.split(" "): - if "=" in l: + for item in line.split(" "): + if "=" in item: return True return False diff --git a/ansible-lint/test/TestAPTRepositoryCacheUpdateRule.py b/ansible-lint/test/TestAPTRepositoryCacheUpdateRule.py index f2aa1e01..90190766 100644 --- a/ansible-lint/test/TestAPTRepositoryCacheUpdateRule.py +++ b/ansible-lint/test/TestAPTRepositoryCacheUpdateRule.py @@ -1,6 +1,7 @@ import unittest -from ansiblelint import RulesCollection, Runner +from ansiblelint.rules import RulesCollection +from ansiblelint.runner import Runner from APTRepositoryCacheUpdateRule import APTRepositoryCacheUpdateRule diff --git a/ansible-lint/test/TestNoLogPasswordsRule.py b/ansible-lint/test/TestNoLogPasswordsRule.py index 3c3b5908..1feedfa5 100644 --- a/ansible-lint/test/TestNoLogPasswordsRule.py +++ b/ansible-lint/test/TestNoLogPasswordsRule.py @@ -1,6 +1,7 @@ import unittest -from ansiblelint import RulesCollection, Runner +from ansiblelint.rules import RulesCollection +from ansiblelint.runner import Runner from NoLogPasswordsRule import NoLogPasswordsRule diff --git a/destroy_containers.yml b/destroy_containers.yml index faa35ee7..ce6fdae4 100644 --- a/destroy_containers.yml +++ b/destroy_containers.yml @@ -41,7 +41,7 @@ - "/openstack/log/{{ container_name }}" - "/var/lib/lxc/{{ container_name }}" - "{{ lxc_container_directory|default('/var/lib/lxc') }}/{{ container_name }}" - - "/var/log/lxc/lxc-{{container_name}}" + - "/var/log/lxc/lxc-{{ container_name }}" delegate_to: "{{ physical_host }}" tags: - container-directories-service diff --git a/listening-port-report.yml b/listening-port-report.yml index 368b55fd..0994ec6b 100644 --- a/listening-port-report.yml +++ b/listening-port-report.yml @@ -39,5 +39,6 @@ {% endfor %} dest: /tmp/listening_port_report.txt + mode: 0644 delegate_to: localhost run_once: true diff --git a/test-prepare-host.yml b/test-prepare-host.yml index f8d8a1e5..ac451197 100644 --- a/test-prepare-host.yml +++ b/test-prepare-host.yml @@ -140,7 +140,8 @@ {% set _ = systemd_network_devices.append({'NetDev': {'Name': 'dummy-' + interface_name, 'Kind': 'dummy'}}) %} {% set _ = systemd_network_devices.append({'NetDev': {'Name': interface_name, 'Kind': 'bridge'}}) %} {% if interface.veth_peer is defined %} - {% set _ = systemd_network_devices.append({'NetDev': {'Name': interface_name + '-veth', 'Kind': 'veth'}, 'Peer': {'Name': interface.veth_peer}}) %} + {% set _ = systemd_network_devices.append({'NetDev': {'Name': interface_name + '-veth', 'Kind': 'veth'}, + 'Peer': {'Name': interface.veth_peer}}) %} {% endif %} {% endif %} {% endfor %} @@ -156,10 +157,16 @@ {% set interface_name = (interface.name | default('br-mgmt')) %} {% if interface.alias is defined %} {% set _ = systemd_network_networks.append({'interface': 'dummy-' + interface_name, 'bridge': interface_name}) %} - {% set _ = systemd_network_networks.append({'interface': interface_name, 'netmask': (interface.netmask | default('255.255.255.0')), 'config_overrides': {'Network': {'Address': {(interface.ip_addr | default('10.1.0.1')): null, (interface.alias | string): null}}}}) %} + {% set _ = systemd_network_networks.append({'interface': interface_name, + 'netmask': (interface.netmask | default('255.255.255.0')), + 'config_overrides': {'Network': {'Address': {(interface.ip_addr | default('10.1.0.1')): null, + (interface.alias | string): null}}}}) %} {% else %} {% set _ = systemd_network_networks.append({'interface': 'dummy-' + interface_name, 'bridge': interface_name}) %} - {% set _ = systemd_network_networks.append({'interface': interface_name, 'address': (interface.ip_addr | default('10.1.0.1')), 'netmask': (interface.netmask | default('255.255.255.0')), 'ipforward': true}) %} + {% set _ = systemd_network_networks.append({'interface': interface_name, + 'address': (interface.ip_addr | default('10.1.0.1')), + 'netmask': (interface.netmask | default('255.255.255.0')), + 'ipforward': true}) %} {% endif %} {% if interface.veth_peer is defined %} {% set _ = systemd_network_networks.append({'interface': interface.veth_peer + '-veth', 'bridge': interface_name}) %} @@ -183,7 +190,9 @@ RemainAfterExit: yes service_type: oneshot execstarts: |- - {% set veths = ['-/sbin/ethtool -K ' + (bootstrap_host_public_interface | default(ansible_default_ipv4['alias'])) + ' gso off sg off tso off tx off'] %} + {% set veths = ['-/sbin/ethtool -K ' + + (bootstrap_host_public_interface | default(ansible_default_ipv4['alias'])) + + ' gso off sg off tso off tx off'] %} {% for interface in (bridges | default([])) %} {% if interface is string %} {% set _ = veths.append('-' + iptool_path[ansible_os_family | lower] + ' link set ' + interface + ' up') %} @@ -221,7 +230,7 @@ {% else %} {% set interface_name = (interface.name | default('br-mgmt')) %} {% endif %} - {% set _ = interfaces.append(hostvars[inventory_hostname][('ansible_' + (interface_name | replace('-', '_')))]['active'] == true) %} + {% set _ = interfaces.append(hostvars[inventory_hostname][('ansible_' + (interface_name | replace('-', '_')))]['active'] | bool ) %} {% endfor %} {{ interfaces }} diff --git a/test-prepare-keys.yml b/test-prepare-keys.yml index de811aba..3d3828d3 100644 --- a/test-prepare-keys.yml +++ b/test-prepare-keys.yml @@ -75,7 +75,11 @@ tasks: # Shell used because facts may not be ready yet - name: Get user home directory - shell: "getent passwd '{{ ansible_user_id }}' | cut -d':' -f6" + shell: | + set -o pipefail + getent passwd '{{ ansible_user_id }}' | cut -d':' -f6 + args: + executable: /bin/bash register: user_home changed_when: false diff --git a/test-repo-setup.yml b/test-repo-setup.yml index 29c555ba..9667c98c 100644 --- a/test-repo-setup.yml +++ b/test-repo-setup.yml @@ -24,6 +24,7 @@ file: state: directory path: "{{ development_repo_directory }}" + mode: 0755 # Git clones for developer testing are expected to be in the # following structure, which mirrors how zuul v3 implements @@ -50,6 +51,7 @@ {% for folder_path in projects_directory_find.stdout_lines %} file://{{ folder_path }}#egg={{ folder_path.split("/")[-1] }} {% endfor %} + mode: 0755 vars_files: - test-vars.yml diff --git a/test-requirements.txt b/test-requirements.txt index 4c2c41b2..d965a546 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,8 +18,8 @@ # Used for lint tests bashate>=0.5.1 # Apache-2.0 -flake8<2.6.0,>=2.5.4 # MIT -ansible-lint==3.4.21 # MIT +flake8==3.8.3 # MIT +ansible-lint==4.3.5 # MIT # Used to help make SNI connections work from python # if python itself does not support it properly (<2.7.9).