From 21ce64a41886525b707889df2b7a0dc446f795b5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 16 Jun 2020 18:12:15 -0400 Subject: [PATCH] Remove sanity jobs from shippable Add fixes to make sanity happy. Depends-On: https://github.com/ansible/ansible-zuul-jobs/pull/533 Signed-off-by: Paul Belanger --- plugins/modules/patch.py | 2 +- requirements.txt | 0 shippable.yml | 6 ------ test-requirements.txt | 0 tests/sanity/ignore-2.9.txt | 10 +++------- 5 files changed, 4 insertions(+), 14 deletions(-) create mode 100644 requirements.txt create mode 100644 test-requirements.txt diff --git a/plugins/modules/patch.py b/plugins/modules/patch.py index 28620f9..9341db6 100644 --- a/plugins/modules/patch.py +++ b/plugins/modules/patch.py @@ -127,7 +127,7 @@ def is_already_applied(patch_func, patch_file, basedir, dest_file=None, binary=F if state == 'present': opts.append('--reverse') - (rc, _, _) = patch_func(opts) + (rc, var1, var2) = patch_func(opts) return rc == 0 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e69de29 diff --git a/shippable.yml b/shippable.yml index 5e81496..55d4b43 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,12 +8,6 @@ matrix: exclude: - env: T=none include: - - env: T=sanity/1 - - env: T=sanity/2 - - env: T=sanity/3 - - env: T=sanity/4 - - env: T=sanity/5 - - env: T=units/2.6/1 - env: T=units/2.7/1 - env: T=units/3.5/1 diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000..e69de29 diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index bfb5e1a..065fb1f 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -5,13 +5,10 @@ plugins/modules/synchronize.py pylint:blacklisted-name plugins/modules/synchronize.py use-argspec-type-path plugins/modules/synchronize.py validate-modules:doc-default-does-not-match-spec plugins/modules/synchronize.py validate-modules:nonexistent-parameter-documented -plugins/modules/synchronize.py validate-modules:parameter-list-no-elements plugins/modules/synchronize.py validate-modules:parameter-type-not-in-doc plugins/modules/synchronize.py validate-modules:undocumented-parameter -plugins/modules/at.py validate-modules:doc-required-mismatch plugins/modules/authorized_key.py validate-modules:parameter-type-not-in-doc plugins/modules/seboolean.py validate-modules:parameter-type-not-in-doc -plugins/modules/selinux.py validate-modules:invalid-ansiblemodule-schema plugins/modules/selinux.py validate-modules:parameter-type-not-in-doc plugins/modules/sysctl.py validate-modules:doc-missing-type plugins/modules/sysctl.py validate-modules:parameter-type-not-in-doc @@ -21,12 +18,11 @@ tests/unit/mock/yaml_helper.py future-import-boilerplate tests/unit/mock/yaml_helper.py metaclass-boilerplate tests/unit/modules/conftest.py future-import-boilerplate tests/unit/modules/conftest.py metaclass-boilerplate -tests/unit/modules/system/interfaces_file/test_interfaces_file.py future-import-boilerplate -tests/unit/modules/system/interfaces_file/test_interfaces_file.py metaclass-boilerplate -tests/unit/modules/system/interfaces_file/test_interfaces_file.py pylint:blacklisted-name tests/unit/modules/system/test_mount.py future-import-boilerplate tests/unit/modules/system/test_mount.py metaclass-boilerplate tests/unit/modules/utils.py future-import-boilerplate tests/unit/modules/utils.py metaclass-boilerplate tests/unit/plugins/action/test_synchronize.py future-import-boilerplate -tests/unit/plugins/action/test_synchronize.py metaclass-boilerplate \ No newline at end of file +tests/unit/plugins/action/test_synchronize.py metaclass-boilerplate +tests/utils/shippable/check_matrix.py replace-urlopen +tests/utils/shippable/timing.py shebang