From e48282f928b76595b6d96090cec2962c0ec5f6de Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 6 Jun 2024 11:15:26 +0200 Subject: [PATCH 1/6] Add yamllint rules for ansible-lint --- .yamllint | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.yamllint b/.yamllint index b9d032d6..88882081 100644 --- a/.yamllint +++ b/.yamllint @@ -3,3 +3,5 @@ extends: relaxed rules: line-length: disable + comments.min-spaces-from-content: 1 + octal-values.forbid-explicit-octal: true From c6797537f911e0a41387d29186c8b65bbd042465 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 6 Jun 2024 11:17:30 +0200 Subject: [PATCH 2/6] Fix yum vs dnf switch --- roles/repos/tasks/redhat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/repos/tasks/redhat.yml b/roles/repos/tasks/redhat.yml index 4b495baa..01388e8d 100644 --- a/roles/repos/tasks/redhat.yml +++ b/roles/repos/tasks/redhat.yml @@ -4,7 +4,7 @@ # for more information why this is needed - name: Ensure gpg exists, for signing keys - ansible.builtin.yum: + ansible.builtin.package: name: gnupg state: present From 4640af424d4955057564c38bdf66ae2bbae73aef Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 6 Jun 2024 11:20:40 +0200 Subject: [PATCH 3/6] Remove ansible-lint rules from yamllint --- .yamllint | 2 -- 1 file changed, 2 deletions(-) diff --git a/.yamllint b/.yamllint index 88882081..b9d032d6 100644 --- a/.yamllint +++ b/.yamllint @@ -3,5 +3,3 @@ extends: relaxed rules: line-length: disable - comments.min-spaces-from-content: 1 - octal-values.forbid-explicit-octal: true From 8a101e2398957150c9bf2730d0cf6f1375a7ffe0 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 6 Jun 2024 16:07:26 +0200 Subject: [PATCH 4/6] Remove Rocky Linux 8 temporarily from tests There's a bug in Elasticsearch 8.14.0 that will keep it from starting in testing environments like hours on Rocky Linux 8. We should wait for the next release and re-enable it. See https://discuss.elastic.co/t/2024-06-06t0032-277-error-o-e-b-elasticsearch-server-domain-co-uk-fatal-exception-while-booting-elasticsearch-java-lang-nullpointerexception-cannot-invoke-org-elasticsearch-nativeaccess-systemd-notify-ready-because-this-systemd-is/360895 for details --- .github/workflows/test_full_stack.yml | 2 +- roles/elasticsearch/tasks/elasticsearch-security.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index c81d24ea..534b780b 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: distro: - - rockylinux8 + #- rockylinux8 - rockylinux9 - ubuntu2004 - ubuntu2204 diff --git a/roles/elasticsearch/tasks/elasticsearch-security.yml b/roles/elasticsearch/tasks/elasticsearch-security.yml index d8166921..62c5ac52 100644 --- a/roles/elasticsearch/tasks/elasticsearch-security.yml +++ b/roles/elasticsearch/tasks/elasticsearch-security.yml @@ -327,7 +327,7 @@ - renew_es_cert ignore_errors: "{{ ansible_check_mode }}" -- name: Start Elasticsearch +- name: Start Elasticsearch for security tasks ansible.builtin.service: name: elasticsearch state: started From 4855ef547edbd98e529610cc0ed7b06a70771ace Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 6 Jun 2024 16:17:46 +0200 Subject: [PATCH 5/6] Remove Rocky Linux 8 from more tests --- .github/workflows/test_role_repos.yml | 17 ++++++++++++++--- .github/workflows/test_roles_pr.yml | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index 8a1858f3..9ad0a0fa 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -39,9 +39,20 @@ jobs: fail-fast: false matrix: - distro: [centos7, debian10, debian11, rockylinux8, rockylinux9, ubuntu2004, ubuntu2204] - scenario: [repos_default, repos_oss] - release: [ 7, 8 ] + distro: + - centos7 + - debian10 + - debian11 + # - rockylinux8 + - rockylinux9 + - ubuntu2004 + - ubuntu2204] + scenario: + - repos_default + - repos_oss] + release: + - 7 + - 8 steps: - name: Check out code diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 67855fa4..c59980da 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: distro: - - rockylinux8 + - rockylinux9 - ubuntu2204 scenario: - elasticstack_default From d15e20dcaaf15fa6ba4bf3c27a0085597a54b9b6 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 6 Jun 2024 16:27:35 +0200 Subject: [PATCH 6/6] Remove Rocky Linux temporarily from tests --- .github/workflows/test_full_stack.yml | 4 ++-- .github/workflows/test_role_repos.yml | 2 +- .github/workflows/test_roles_pr.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 534b780b..bce5bf3e 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -33,8 +33,8 @@ jobs: fail-fast: false matrix: distro: - #- rockylinux8 - - rockylinux9 + # - rockylinux8 + # - rockylinux9 - ubuntu2004 - ubuntu2204 - debian10 diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index 9ad0a0fa..a857662c 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -44,7 +44,7 @@ jobs: - debian10 - debian11 # - rockylinux8 - - rockylinux9 + # - rockylinux9 - ubuntu2004 - ubuntu2204] scenario: diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index c59980da..d7717e8c 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: distro: - - rockylinux9 + #- rockylinux9 - ubuntu2204 scenario: - elasticstack_default