From 3acb895fbc4229a2a8ee03a92dba4eb1a5dd1ff3 Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Sep 26 2019 08:44:09 +0000 Subject: fix yamllint reported errors under roles/ With the fix some warnings are still left... # yamllint -d "{extends: default, rules: {line-length: {max: 120}, indentation: disable}}" roles/ roles/standard-test-avocado/tasks/main.yml 6:11 warning too few spaces before comment (comments) roles/standard-test-source/vars/main.yml 6:10 warning truthy value should be one of [false, true] (truthy) 7:13 warning truthy value should be one of [false, true] (truthy) roles/standard-test-source/tasks/main.yml 13:21 warning truthy value should be one of [false, true] (truthy) 34:21 warning truthy value should be one of [false, true] (truthy) 38:20 warning truthy value should be one of [false, true] (truthy) roles/standard-test-beakerlib/tasks/main.yml 39:12 warning truthy value should be one of [false, true] (truthy) 48:12 warning truthy value should be one of [false, true] (truthy) roles/str-common-pkgs/tasks/pkgs-rpm-ostree.yml 1:1 warning missing document start "---" (document-start) 29:18 warning truthy value should be one of [false, true] (truthy) 41:19 warning truthy value should be one of [false, true] (truthy) 42:18 warning truthy value should be one of [false, true] (truthy) 43:18 warning truthy value should be one of [false, true] (truthy) roles/str-common-pkgs/tasks/main.yml 1:1 warning missing document start "---" (document-start) roles/str-common-pkgs/tasks/inspect.yml 1:1 warning missing document start "---" (document-start) 7:19 warning truthy value should be one of [false, true] (truthy) 8:21 warning truthy value should be one of [false, true] (truthy) 11:23 warning truthy value should be one of [false, true] (truthy) 16:19 warning truthy value should be one of [false, true] (truthy) roles/str-common-pkgs/tasks/pkgs-yum.yml 1:1 warning missing document start "---" (document-start) 18:18 warning truthy value should be one of [false, true] (truthy) roles/str-common-pkgs/tasks/pkgs-dnf.yml 1:1 warning missing document start "---" (document-start) 25:18 warning truthy value should be one of [false, true] (truthy) roles/standard-test-basic/vars/main.yml 2:1 warning missing document start "---" (document-start) roles/str-common-init/tasks/main.yml 1:1 warning missing document start "---" (document-start) roles/str-common-init/tasks/inspect.yml 1:1 warning missing document start "---" (document-start) 7:19 warning truthy value should be one of [false, true] (truthy) 8:21 warning truthy value should be one of [false, true] (truthy) 11:23 warning truthy value should be one of [false, true] (truthy) 16:19 warning truthy value should be one of [false, true] (truthy) roles/str-common-init/tasks/trunner.yml 1:1 warning missing document start "---" (document-start) 10:21 warning truthy value should be one of [false, true] (truthy) 31:21 warning truthy value should be one of [false, true] (truthy) 34:21 warning truthy value should be one of [false, true] (truthy) 53:21 warning truthy value should be one of [false, true] (truthy) --- diff --git a/roles/standard-test-avocado/tasks/main.yml b/roles/standard-test-avocado/tasks/main.yml index 04c3a9e..c442361 100644 --- a/roles/standard-test-avocado/tasks/main.yml +++ b/roles/standard-test-avocado/tasks/main.yml @@ -25,7 +25,9 @@ - block: - name: Execute the avocado test - shell: exec 2>>{{ remote_artifacts }}/test.log 1>>{{ remote_artifacts }}/test.log; MODULE=rpm python -m avocado run --job-results-dir {{ remote_artifacts }}/ {{tests|join(' ') }} + shell: > + exec 2>>{{ remote_artifacts }}/test.log 1>>{{ remote_artifacts }}/test.log; + MODULE=rpm python -m avocado run --job-results-dir {{ remote_artifacts }}/ {{tests|join(' ') }} always: - name: Pull out the logs diff --git a/roles/standard-test-basic/tasks/main.yml b/roles/standard-test-basic/tasks/main.yml index d0e5e6f..e8725cd 100644 --- a/roles/standard-test-basic/tasks/main.yml +++ b/roles/standard-test-basic/tasks/main.yml @@ -9,18 +9,27 @@ # tests: # - test one: # dir: tdir for test 1 -# run: echo '$'; echo '\$'; echo a1; echo "a$2"; a3="a3\na3"; echo -e ${a3}; echo \$a4; echo '$a5'; echo ">\"a6\"<"; echo "a7'\""; echo "(a8)" ; (echo "a9"); echo $(echo "a10"); echo 'a11$a11"'; echo '\\a12\\'; echo '"a13';false +# run: echo '$'; echo '\$'; echo a1; echo "a$2"; a3="a3\na3"; echo -e ${a3}; \ +# echo \$a4; echo '$a5'; echo ">\"a6\"<"; echo "a7'\""; echo "(a8)" ; \ +# (echo "a9"); echo $(echo "a10"); echo 'a11$a11"'; echo '\\a12\\'; echo '"a13';false - block: - name: Execute tests script: | run-basic-test -v \ - --workdir "{{ tenv_workdir }}/{{ item if item.keys is not defined else item[(item.keys()|list)[0]]['dir']|default((item.keys()|list)[0]) }}" \ + --workdir "{{ tenv_workdir }}/{{ item if item.keys is not defined else + item[(item.keys()|list)[0]]['dir']|default((item.keys()|list)[0]) }}" \ --artifactsdir "{{ remote_artifacts }}" \ --test "{{ item if item.keys is not defined else (item.keys()|list)[0] }}" \ - --timeout "{{ '0' if item.keys is not defined else item[(item.keys()|list)[0]]['timeout']|default('0') }}" \ - --cmd "{{ './runtest.sh' if item.keys is not defined else item[(item.keys()|list)[0]]['run']|default('./runtest.sh') | regex_replace('\\', '\\\\') | regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}" \ - --save-files "{{ '' if item.keys is not defined else item[(item.keys()|list)[0]]['save_files']|default(item[(item.keys()|list)[0]]['save-files']|default('')) | join(',') | regex_replace('\\', '\\\\') | regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}" + --timeout "{{ '0' if item.keys is not defined else + item[(item.keys()|list)[0]]['timeout']|default('0') }}" \ + --cmd "{{ './runtest.sh' if item.keys is not defined else + item[(item.keys()|list)[0]]['run']|default('./runtest.sh') | regex_replace('\\', '\\\\') | + regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}" \ + --save-files "{{ '' if item.keys is not defined else + item[(item.keys()|list)[0]]['save_files']| + default(item[(item.keys()|list)[0]]['save-files']|default('')) | join(',') | + regex_replace('\\', '\\\\') | regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}" with_items: - "{{ tests }}" diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml index 5b60a25..8c4e86b 100644 --- a/roles/standard-test-beakerlib/tasks/main.yml +++ b/roles/standard-test-beakerlib/tasks/main.yml @@ -56,7 +56,8 @@ script: run-beakerlib-test --workdir {{ tenv_workdir }} \ --artifactsdir {{ remote_artifacts }} \ --test "{{ item if item.keys is not defined else (item.keys()|list)[0] }}" \ - --timeout "{{ '0' if item.keys is not defined else item[(item.keys()|list)[0]]['timeout']|default('0') }}" + --timeout "{{ '0' if item.keys is not defined else + item[(item.keys()|list)[0]]['timeout']|default('0') }}" with_items: - "{{ tests }}" - "{{ filter_tests }}" diff --git a/roles/standard-test-source/tasks/main.yml b/roles/standard-test-source/tasks/main.yml index 2e53ff9..9cb17a3 100644 --- a/roles/standard-test-source/tasks/main.yml +++ b/roles/standard-test-source/tasks/main.yml @@ -90,7 +90,8 @@ - name: Extract and setup the sources shell: | rm -rf "{{srcdir}}" - rpmbuild -bp {{tenv_workdir}}/*.spec --nodeps --define "_sourcedir {{tenv_workdir}}/" --define "_builddir {{srcdir}}" + rpmbuild -bp {{tenv_workdir}}/*.spec --nodeps --define \ + "_sourcedir {{tenv_workdir}}/" --define "_builddir {{srcdir}}" args: warn: false when: not fetch_only diff --git a/roles/str-common-init/tasks/inspect.yml b/roles/str-common-init/tasks/inspect.yml index 9a8ecf9..81e0dba 100644 --- a/roles/str-common-init/tasks/inspect.yml +++ b/roles/str-common-init/tasks/inspect.yml @@ -10,7 +10,7 @@ - name: Set fact 'is_atomic' delegate_facts: True set_fact: - is_atomic : "{{ os_release_atomic.found > 0 }}" + is_atomic: "{{ os_release_atomic.found > 0 }}" - name: Set facts about system delegate_facts: True diff --git a/roles/str-common-pkgs/tasks/inspect.yml b/roles/str-common-pkgs/tasks/inspect.yml index 1cfcc1f..395dc3f 100644 --- a/roles/str-common-pkgs/tasks/inspect.yml +++ b/roles/str-common-pkgs/tasks/inspect.yml @@ -10,7 +10,7 @@ - name: Set fact 'is_atomic' delegate_facts: True set_fact: - is_atomic : "{{ os_release_atomic.found > 0 }}" + is_atomic: "{{ os_release_atomic.found > 0 }}" - name: Set facts about system delegate_facts: True diff --git a/roles/str-common-pkgs/tasks/main.yml b/roles/str-common-pkgs/tasks/main.yml index a880b8d..32d396e 100644 --- a/roles/str-common-pkgs/tasks/main.yml +++ b/roles/str-common-pkgs/tasks/main.yml @@ -34,4 +34,3 @@ verbosity: 1 - include_tasks: "pkgs-{{ pkg_mgr | trim}}.yml" - diff --git a/roles/str-common-pkgs/tasks/pkgs-rpm-ostree.yml b/roles/str-common-pkgs/tasks/pkgs-rpm-ostree.yml index 4cd2928..207945e 100644 --- a/roles/str-common-pkgs/tasks/pkgs-rpm-ostree.yml +++ b/roles/str-common-pkgs/tasks/pkgs-rpm-ostree.yml @@ -40,7 +40,7 @@ register: package_check changed_when: False failed_when: False - args: { warn: no } + args: {warn: no} - name: Install test-specific package requirements shell: rpm-ostree install {{ pkgs_atomic_req }} diff --git a/roles/str-common-pkgs/tasks/pkgs-yum.yml b/roles/str-common-pkgs/tasks/pkgs-yum.yml index ddd0a49..615155e 100644 --- a/roles/str-common-pkgs/tasks/pkgs-yum.yml +++ b/roles/str-common-pkgs/tasks/pkgs-yum.yml @@ -36,4 +36,3 @@ retries: 5 delay: 10 until: result is succeeded -