Run tidy_images in CI workflows

.github/workflows/os_builder.yaml

@@ -27,6 +27,8 @@ jobs:
             cd os_builders &&
             packer init . &&
             packer validate -syntax-only .
+          env:
+            PACKER_GITHUB_API_TOKEN: ${{ secrets.PACKER_GITHUB_API_TOKEN }}
 
   test_image_build_ubuntu:
       strategy:
@@ -48,7 +50,7 @@ jobs:
           run: |
             . venv/bin/activate
             cd os_builders
-            ansible-playbook configure_os_images.yml -i ../.github/localhost.yml --extra-vars tidy_image=false
+            ansible-playbook configure_os_images.yml -i ../.github/localhost.yml
 
   test_image_build_rocky:
     strategy:
@@ -66,4 +68,4 @@ jobs:
       - name: Run configure_os_images playbook
         run: |
           cd os_builders
-          ansible-playbook configure_os_images.yml -i ../.github/localhost.yml --extra-vars tidy_image=false
+          ansible-playbook configure_os_images.yml -i ../.github/localhost.yml

os_builders/configure_os_images.yml

@@ -18,4 +18,4 @@
     - role: container_registry
     - role: nubes_bootcontext
     - role: tidy_image
-      when: "{{ tidy_image | default(true) | bool == true }}"
+

os_builders/roles/tidy_image/tasks/clear_audit_log.yml

@@ -2,6 +2,7 @@
   block:
   - name: Clear Audit log
     shell: "/bin/cat /dev/null > /var/log/audit/audit.log"
+  ignore_errors: true
   when: ansible_distribution == "Rocky"
   become: true
 

os_builders/roles/tidy_image/tasks/logrotate.yml

@@ -14,7 +14,7 @@
 
 
 - name: Clear Audit log
-  shell: "sudo logrotate -f /etc/logrotate.conf"
+  shell: "logrotate -f /etc/logrotate.conf"
   become: true
 
 - name: Cleanout /var/log/*.gz

os_builders/roles/tidy_image/tasks/main.yml

@@ -1,14 +1,24 @@
 # Cleanup machine
 
+- name: Check if we are in a container from the GitHub workflows
+  become: true
+  ansible.builtin.command: "cat /proc/self/cgroup"
+  register: in_container_check
+
+- name: set_fact for checking container
+  ansible.builtin.set_fact:
+    in_container: "{{ in_container_check.stdout != '0::/' }}"
+
 - include_tasks: reboot.yml
+  when: in_container
+
 - include_tasks: get_package_facts.yml
 - include_tasks: run_quattor.yml
   when: ansible_distribution == "Rocky" 
 - include_tasks: get_package_facts.yml
 - include_tasks: cleanout_tmp.yml
 - include_tasks: cleanout_rc_directories.yml
 - include_tasks: cleanup_network_conf.yml
-- include_tasks: run_update_keys.yml
 - include_tasks: set_locale.yml
 - include_tasks: wazuh.yml
 - include_tasks: cleanup_quattor.yml

os_builders/roles/tidy_image/tasks/run_pakiti.yml

@@ -2,3 +2,4 @@
   command:
     cmd: "pakiti2-client"
   become: true
+  when: in_container

os_builders/roles/tidy_image/tasks/run_quattor.yml

@@ -1,5 +1,5 @@
 - name: run quattor
-  shell: "sudo quattor-fetch && sudo quattor-configure --all --verbose"
+  shell: "quattor-fetch && quattor-configure --all --verbose"
   ignore_errors: true
   when: ansible_distribution == "Rocky" 
   become: true

os_builders/roles/tidy_image/tasks/set_locale.yml

@@ -32,28 +32,31 @@
   when: not ansible_check_mode and found_language.rc != 0
   become: true
 
-- name: Get current locale and language configuration
-  command: localectl status
-  register: locale_status
-  changed_when: false
-  become: true
+- name: configure locale
+  block:
+    - name: Get current locale and language configuration
+      command: localectl status
+      register: locale_status
+      changed_when: false
+      become: true
 
-- name: Parse 'LANG' from current locale and language configuration
-  set_fact:
-    locale_lang: "{{ locale_status.stdout | regex_search('LANG=([^\n]+)', '\\1') | first }}"
+    - name: Parse 'LANG' from current locale and language configuration
+      set_fact:
+        locale_lang: "{{ locale_status.stdout | regex_search('LANG=([^\n]+)', '\\1') | first }}"
 
-- name: Parse 'LANGUAGE' from current locale and language configuration
-  set_fact:
-    locale_language: "{{ locale_status.stdout | regex_search('LANGUAGE=([^\n]+)', '\\1') | default([locale_lang], true) | first }}"
+    - name: Parse 'LANGUAGE' from current locale and language configuration
+      set_fact:
+        locale_language: "{{ locale_status.stdout | regex_search('LANGUAGE=([^\n]+)', '\\1') | default([locale_lang], true) | first }}"
 
-- name: Configure locale to '{{ config_system_locale }}' and language to '{{ config_system_language }}'
-  command: localectl set-locale LANG={{ config_system_locale }} LANGUAGE={{ config_system_language }}
-  become: true
+    - name: Configure locale to '{{ config_system_locale }}' and language to '{{ config_system_language }}'
+      command: localectl set-locale LANG={{ config_system_locale }} LANGUAGE={{ config_system_language }}
+      become: true
 
-- name: Set locale keymap
-  command: localectl set-keymap gb
-  when: ansible_distribution == "Rocky"
-  become: true
+    - name: Set locale keymap
+      command: localectl set-keymap gb
+      when: ansible_distribution == "Rocky"
+      become: true
+  when: in_container
 
 # - name: Set locale keymap
 #   command: loadkeys uk

os_builders/roles/tidy_image/tasks/wazuh.yml

@@ -9,6 +9,7 @@
   when: wazuh_package_name in ansible_facts.packages
   ignore_errors: True
   become: true
+  when: in_container
 
 - name: Clean Wazuh agent history
   file:

os_builders/roles/vm_baseline/files/update_keys.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -x
+
 if ls /home/cloud
 then
     KEYSPATH=/home/cloud

os_builders/roles/vm_baseline/tasks/locale.yml

@@ -0,0 +1,18 @@
+---
+- name: Install locales on Debian
+  ansible.builtin.apt:
+    name: locales
+    state: present
+    update_cache: true
+  become: true
+  when: ansible_os_family == "Debian"
+
+- name: Install locales on RedHat
+  ansible.builtin.dnf:
+    name:
+      - glibc-locale-source
+      - glibc-langpack-en
+    state: present
+  become: true
+  when: ansible_os_family == "RedHat"
+

os_builders/roles/vm_baseline/tasks/main.yml

@@ -3,6 +3,7 @@
 
 - include_tasks: cron.yml
 - include_tasks: grub-cmdline.yml
+- include_tasks: locale.yml
 
 - include_tasks: ssh.yml
 - include_tasks: rsyslog.yml