Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,16 @@ jobs:
strategy:
matrix:
ansible:
- stable-2.9
- stable-2.10
- stable-2.11
- stable-2.12
- stable-2.13
- stable-2.14
- stable-2.15
- stable-2.16
- stable-2.17
- devel

runs-on: >-
${{ contains(fromJson(
'["stable-2.9", "stable-2.10", "stable-2.11", "stable-2.12", "stable-2.13", "stable-2.14"]'
'["stable-2.13", "stable-2.14"]'
), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
steps:

Expand All @@ -46,22 +43,19 @@ jobs:
units:
runs-on: >-
${{ contains(fromJson(
'["stable-2.9", "stable-2.10", "stable-2.11", "stable-2.12", "stable-2.13", "stable-2.14"]'
'["stable-2.13", "stable-2.14"]'
), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
name: Units (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
strategy:
# As soon as the first unit test fails, cancel the others to free up the CI queue
fail-fast: true
matrix:
ansible:
- stable-2.9
- stable-2.10
- stable-2.11
- stable-2.12
- stable-2.13
- stable-2.14
- stable-2.15
- stable-2.16
- stable-2.17
- devel

steps:
Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,13 @@ Every voice is important. If you have something on your mind, create an issue or
## Tested with Ansible and the following Python versions

Tested Ansible versions:
- 2.9
- 2.10
- 2.11
- 2.12
- 2.13
- 2.14
- 2.15
- 2.16
- devel

Tested Python versions:
- 2.6
- 2.7
- 3.5
- 3.6
- 3.7
- 3.8
Expand All @@ -90,6 +83,9 @@ Due to SAP licensing and hardware requirements, integration tests are momentaril
The modules are tested manually against SAP systems until we found a solution or have some
modules where we are able to execute integration test we decided to disable these tests.

The test support for Ansible versions 2.9 - 2.12 is disabled due to eol of these versions.
The modules may work with these versions but are not tested.

## External requirements

For some modules the below requirements are needed on the host that executes a module.
Expand Down
5 changes: 5 additions & 0 deletions changelogs/fragments/0043-Ansible_eol_support_drop.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
minor_changes:
- Drop support for ansible <= 2.12
- Add test for ansible 2.18 aka devel
bugfixes:
- Fix pipelines
3 changes: 2 additions & 1 deletion tests/sanity/ignore-2.17.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ plugins/modules/sap_snote.py validate-modules:missing-gplv3-license # Licensed u
plugins/modules/sap_system_facts.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_task_list_execute.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_user.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sapcar_extract.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sapcar_extract.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
tests/unit/compat/mock.py pylint:use-yield-from # suggested construct does not work with Python 2
10 changes: 10 additions & 0 deletions tests/sanity/ignore-2.18.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
plugins/modules/sap_pyrfc.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_company.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_control_exec.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_hdbsql.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_snote.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_system_facts.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_task_list_execute.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sap_user.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
plugins/modules/sapcar_extract.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
tests/unit/compat/mock.py pylint:use-yield-from # suggested construct does not work with Python 2
23 changes: 5 additions & 18 deletions tests/unit/compat/mock.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
# (c) 2014, Toshio Kuratomi <[email protected]>
#
# This file is part of Ansible
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Ansible is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# Copyright (c) 2014, Toshio Kuratomi <[email protected]>
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

# Make coding more python3-ish
from __future__ import (absolute_import, division, print_function)
Expand All @@ -33,12 +20,12 @@
# Allow wildcard import because we really do want to import all of mock's
# symbols into this compat shim
# pylint: disable=wildcard-import,unused-wildcard-import
from unittest.mock import *
from unittest.mock import * # noqa: F401, pylint: disable=unused-import
except ImportError:
# Python 2
# pylint: disable=wildcard-import,unused-wildcard-import
try:
from mock import *
from mock import * # noqa: F401, pylint: disable=unused-import
except ImportError:
print('You need the mock library installed on python2.x to run tests')

Expand Down