From 652864114d9c59aad3bb47d3e4ade1625b4f7649 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Thu, 7 Sep 2023 08:48:26 +0200 Subject: [PATCH 1/4] Debug --- .github/workflows/test_roles_pr.yml | 7 ++++--- roles/elasticsearch/tasks/main.yml | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index ad50534f..7f63ad4a 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -51,12 +51,13 @@ jobs: max-parallel: 2 matrix: distro: - - rockylinux8 - - ubuntu2204 + #- rockylinux8 + #- ubuntu2204 + - debian10 scenario: - elasticstack_default release: - - 7 + #- 7 - 8 steps: diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 7677f040..8c7dbf58 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -186,6 +186,14 @@ changed_when: false when: ansible_virtualization_type == "container" +- name: setup + ansible.builtin.setup: + register: setup_result + +- name: print ansible vars + ansible.builtin.debug: + var: setup_result + - name: Import Tasks elasticsearch-security.yml ansible.builtin.import_tasks: elasticsearch-security.yml when: From ef15b8f2de782d10467c4364ca9c93f6f127729e Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Thu, 7 Sep 2023 09:10:35 +0200 Subject: [PATCH 2/4] Fix debian 10 pipeline --- roles/elasticsearch/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 8c7dbf58..b1a575f2 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -175,7 +175,7 @@ - name: Force systemd to reread configs on container ansible.builtin.systemd: daemon_reload: true - when: ansible_virtualization_type == "container" + when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker" # Free up some space to let elsticsearch allocate replica in GitHub Action - name: Remove cache # noqa: risky-shell-pipe @@ -184,7 +184,7 @@ rm -rf /var/cache/* failed_when: false changed_when: false - when: ansible_virtualization_type == "container" + when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker" - name: setup ansible.builtin.setup: From 995b7e3b0c1a69153092c57bd4daaebb856504be Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Thu, 7 Sep 2023 09:31:29 +0200 Subject: [PATCH 3/4] Remove debugs --- roles/elasticsearch/tasks/main.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index b1a575f2..6de5b3f1 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -186,14 +186,6 @@ changed_when: false when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker" -- name: setup - ansible.builtin.setup: - register: setup_result - -- name: print ansible vars - ansible.builtin.debug: - var: setup_result - - name: Import Tasks elasticsearch-security.yml ansible.builtin.import_tasks: elasticsearch-security.yml when: From 531c9f5088331c2b60af31ffd48d092c95537da9 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Thu, 7 Sep 2023 09:32:41 +0200 Subject: [PATCH 4/4] Remove other debugs --- .github/workflows/test_roles_pr.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 7f63ad4a..ad50534f 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -51,13 +51,12 @@ jobs: max-parallel: 2 matrix: distro: - #- rockylinux8 - #- ubuntu2204 - - debian10 + - rockylinux8 + - ubuntu2204 scenario: - elasticstack_default release: - #- 7 + - 7 - 8 steps: