OPSEXP-2954 Support ubuntu 24.04 (#1020)

Alfresco · Jan 17, 2025 · 6935859 · 6935859
1 parent f896920
commit 6935859
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 27 deletions.
diff --git a/.github/workflows/community.yml b/.github/workflows/community.yml
@@ -52,6 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         molecule_distro:
+          - image: ubuntu:24.04
           - image: ubuntu:22.04
           - image: rockylinux/rockylinux:9.4
         role:

diff --git a/.github/workflows/enteprise.yml b/.github/workflows/enteprise.yml
@@ -152,6 +152,11 @@ jobs:
             molecule_distro:
               image: ubuntu:22.04
             runner: ubuntu-latest-arm64-small
+          - scenario:
+              name: docker_enterprise
+            molecule_distro:
+              image: ubuntu:24.04
+            runner: ubuntu-latest-arm64-small
 
     uses: ./.github/workflows/docker.yml
     with:
@@ -192,7 +197,7 @@ jobs:
             desc: EC2 ACS 7.4 (RHEL 8.9)
           - name: default
             vars: vars-ubuntu-community.yml
-            desc: EC2 ACS 23.x Community (Ubuntu 22.04)
+            desc: EC2 ACS 23.x Community (Ubuntu 24.04)
           - name: default
             vars: vars-rocky9.yml
             desc: EC2 ACS 23.x (Rocky Linux 9.4)

diff --git a/.secrets.baseline b/.secrets.baseline
@@ -234,7 +234,7 @@
         "filename": "roles/transformers/tasks/main.yml",
         "hashed_secret": "0eeb6b7bb932e8594b4ffe039dc15332f670cbd9",
         "is_verified": false,
-        "line_number": 80,
+        "line_number": 92,
         "is_secret": false
       }
     ],
@@ -259,5 +259,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-13T16:47:22Z"
+  "generated_at": "2025-01-15T11:23:05Z"
 }
diff --git a/7.2.N-extra-vars.yml b/7.2.N-extra-vars.yml
@@ -56,4 +56,4 @@ dependencies_version:
   tomcat: 9.0.97
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
-  imagemagick: 7.1.0-16-ci-10
+  imagemagick: 7.1.0-16-ci-11
diff --git a/7.3.N-extra-vars.yml b/7.3.N-extra-vars.yml
@@ -56,4 +56,4 @@ dependencies_version:
   tomcat: 9.0.97
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
-  imagemagick: 7.1.0-16-ci-10
+  imagemagick: 7.1.0-16-ci-11
diff --git a/7.4.N-extra-vars.yml b/7.4.N-extra-vars.yml
@@ -64,4 +64,4 @@ dependencies_version:
   tomcat: 9.0.97
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
-  imagemagick: 7.1.0-16-ci-10
+  imagemagick: 7.1.0-16-ci-11
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -110,6 +110,7 @@ supported_os:
       - 8.6
   Ubuntu:
     versions:
+      - 24.04
       - 22.04
       - 20.04
       - 18.04
@@ -197,7 +198,7 @@ dependencies_version:
   tomcat: 10.1.33
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
-  imagemagick: 7.1.0-16-ci-10
+  imagemagick: 7.1.0-16-ci-11
 apache_archive_url: https://archive.apache.org
 java_major: "{{ dependencies_version.java | regex_search('^[0-9]+') }}"
 tomcat_archive_url: "{{ apache_archive_url }}/dist/tomcat"

diff --git a/molecule/default/tasks/detect_ec2_node_hostname.yml b/molecule/default/tasks/detect_ec2_node_hostname.yml
@@ -13,7 +13,8 @@
 - name: Set variable for AWS instance detection
   delegate_to: "{{ groups['nginx'][0] }}"
   ansible.builtin.set_fact:
-    is_aws_environment: "{{ aws_uri_check.status == 200 }}"
+    # Since IMDSv2 requires token authentication but here we are just probing it
+    is_aws_environment: "{{ aws_uri_check.status == 200 or aws_uri_check.status == 401 }}"
 
 - name: Gather EC2 facts
   delegate_to: "{{ groups['nginx'][0] }}"

diff --git a/molecule/default/vars-ubuntu-community.yml b/molecule/default/vars-ubuntu-community.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-023de9d2acab166f2 # ubuntu-minimal/images/hvm-ssd/ubuntu-jammy-22.04-amd64-minimal-20240701
+MOLECULE_IT_IMAGE_ID: ami-0e9085e60087ce171 # amazon/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241109
 MOLECULE_IT_EXTRA_VARS: community-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config-community.json
 MOLECULE_IT_PLATFORM: ubuntu-community
diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
@@ -147,6 +147,7 @@ os_fallback:
   - ../vars/{{ ansible_system }}.yml
 
 os_family_yml: "{{ ansible_os_family }}.yml"
+os_distribution_yml: "{{ ansible_distribution }}.yml"
 os_version_yml: "{{ ansible_distribution }}{{ ansible_distribution_major_version }}.yml"
 
 ansible_installation_status_file: "{{ binaries_folder }}/.ansible_alfresco_components.status"

diff --git a/roles/identity/molecule/default/molecule.yml b/roles/identity/molecule/default/molecule.yml
@@ -27,3 +27,19 @@ provisioner:
       group_vars: ../../../../group_vars
 verifier:
   name: ansible
+
+scenario:
+  test_sequence:
+    - dependency
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - converge
+    # see OPSEXP-3016
+    # - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
diff --git a/roles/transformers/tasks/imagemagick.yml b/roles/transformers/tasks/imagemagick.yml
@@ -21,15 +21,15 @@
     checksum: "sha1:{{ lookup('url', pkg_url + '.sha1') }}"
     dest: "{{ download_location }}/{{ pkg_name }}"
     mode: "0644"
-  loop: "{{  imagemagick_packages }}"
+  loop: "{{  transformers_imagemagick_packages }}"
 
 - name: Install ImageMagick deb packages
   become: true
   when: pkg_format == 'deb'
   ansible.builtin.apt:
     deb: "{{ download_location }}/{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }}"
     state: present
-  loop: "{{  imagemagick_packages }}"
+  loop: "{{  transformers_imagemagick_packages }}"
 
 - name: Install ImageMagick rpm packages
   become: true
@@ -39,4 +39,4 @@
     name: >-
       {{ download_location }}/{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }}
     disable_gpg_check: true
-  loop: "{{  imagemagick_packages }}"
+  loop: "{{  transformers_imagemagick_packages }}"
diff --git a/roles/transformers/tasks/main.yml b/roles/transformers/tasks/main.yml
@@ -4,9 +4,21 @@
   ansible.builtin.include_vars:
     file: "{{ os_family_yml }}"
 
+- name: Include OS distribution variables
+  ansible.builtin.include_vars:
+    file: "{{ item }}"
+  with_first_found:
+    - files:
+      - "{{ os_distribution_yml }}"
+      skip: True
+
 - name: Include OS version variables
   ansible.builtin.include_vars:
-    file: "{{ os_version_yml }}"
+    file: "{{ item }}"
+  with_first_found:
+    - files:
+      - "{{ os_version_yml }}"
+      skip: True
 
 - name: Configure Java keystore
   ansible.builtin.include_role:

diff --git a/roles/transformers/vars/Debian.yml b/roles/transformers/vars/Debian.yml
@@ -1,5 +1,5 @@
 ---
-imagemagick_packages:
+transformers_imagemagick_packages:
   - imagemagick-distribution-linux
 
 imagemagick_home: "/opt/imagemagick-{{ imagemagick_version | regex_search('^[0-9]+') }}"

diff --git a/roles/transformers/vars/RedHat8.yml b/roles/transformers/vars/RedHat8.yml
@@ -1,5 +1,5 @@
 ---
-imagemagick_packages:
+transformers_imagemagick_packages:
   - imagemagick-distribution-libs-el8
   - imagemagick-distribution-el8
 

diff --git a/roles/transformers/vars/RedHat9.yml b/roles/transformers/vars/RedHat9.yml
@@ -1,5 +1,5 @@
 ---
-imagemagick_packages:
+transformers_imagemagick_packages:
   - imagemagick-distribution-libs-el9
   - imagemagick-distribution-el9
 

diff --git a/roles/transformers/vars/Rocky8.yml b/roles/transformers/vars/Rocky8.yml
@@ -1,5 +1,5 @@
 ---
-imagemagick_packages:
+transformers_imagemagick_packages:
   - imagemagick-distribution-libs-el8
   - imagemagick-distribution-el8
 

diff --git a/roles/transformers/vars/Rocky9.yml b/roles/transformers/vars/Rocky9.yml
@@ -1,5 +1,5 @@
 ---
-imagemagick_packages:
+transformers_imagemagick_packages:
   - imagemagick-distribution-libs-el9
   - imagemagick-distribution-el9
 

diff --git a/roles/transformers/vars/Ubuntu.yml b/roles/transformers/vars/Ubuntu.yml
@@ -0,0 +1,3 @@
+---
+transformers_imagemagick_packages:
+  - "imagemagick-distribution-ub{{ ansible_distribution_version | replace('.', '') }}"
diff --git a/roles/transformers/vars/Ubuntu18.yml b/roles/transformers/vars/Ubuntu18.yml
diff --git a/roles/transformers/vars/Ubuntu20.yml b/roles/transformers/vars/Ubuntu20.yml
diff --git a/roles/transformers/vars/Ubuntu22.yml b/roles/transformers/vars/Ubuntu22.yml