From 1ae33c7845232b269110235b85c5694ac9d016dd Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 8 Jan 2025 16:31:49 +0100 Subject: [PATCH 1/3] Run CI on CentOS 10 stream images Signed-off-by: Jakub Jelen --- .github/workflows/ansible-centos.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ansible-centos.yml b/.github/workflows/ansible-centos.yml index 328a5d1..0e2f7c2 100644 --- a/.github/workflows/ansible-centos.yml +++ b/.github/workflows/ansible-centos.yml @@ -44,3 +44,16 @@ jobs: group: local hosts: localhost targets: "tests/tests_*.yml" + + centos-10: + runs-on: ubuntu-latest + steps: + - name: checkout PR + uses: actions/checkout@v4 + + - name: ansible check with centos 10 + uses: roles-ansible/check-ansible-centos-centos10-action@main + with: + group: local + hosts: localhost + targets: "tests/tests_*.yml" From 9a2287c7129e6e890ceddfd1b80c8510c5996f27 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 8 Jan 2025 16:37:19 +0100 Subject: [PATCH 2/3] Workaround wrong parsing of compression This was reported upstream and fixed: https://bugzilla.mindrot.org/show_bug.cgi?id=3759 But the compression is something we do not want to use anyway much so implementing this workaround similar to the one we did in the server role: https://github.com/willshersystems/ansible-sshd/pull/304 Signed-off-by: Jakub Jelen --- tests/tests_match.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/tests_match.yml b/tests/tests_match.yml index 6ed7a85..caeb582 100644 --- a/tests/tests_match.yml +++ b/tests/tests_match.yml @@ -19,7 +19,7 @@ ssh: Match: - Condition: user testuser - Compression: true + LogLevel: DEBUG2 - Condition: host example Hostname: example.com Host: @@ -39,7 +39,7 @@ assert: that: - "'Match user testuser' in config.content | b64decode" - - "'Compression yes' in config.content | b64decode" + - "'LogLevel DEBUG2' in config.content | b64decode" - "'Match host example' in config.content | b64decode" - "'Hostname example.com' in config.content | b64decode" - "'Host local' in config.content | b64decode" @@ -70,9 +70,9 @@ - name: Verify the options are correctly evaluated assert: that: - - "'compression yes' in test1.stdout" - - "'compression yes' not in test2.stdout" - - "'compression yes' not in test3.stdout" + - "'loglevel DEBUG2' in test1.stdout" + - "'loglevel DEBUG2' not in test2.stdout" + - "'loglevel DEBUG2' not in test3.stdout" - "'hostname example.com' in test1.stdout" - "'hostname example.com' not in test2.stdout" - "'hostname example.com' not in test3.stdout" From 59b0f17cc69f6226f6e09e9a686f52e27c1bb3ff Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 8 Jan 2025 16:43:03 +0100 Subject: [PATCH 3/3] Add RH/CentOS 10 to documentation and meta too Signed-off-by: Jakub Jelen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f5a8645..2e760d2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ An Ansible role for managing ssh clients configuration. This role should work on any system that provides openssh client and is supported by ansible. The role was tested on: -* RHEL/CentOS 6, 7, 8, 9 +* RHEL/CentOS 6, 7, 8, 9, 10 * Fedora * Debian * Ubuntu