OPSEXP-3058 Move supported_os vars to version specific vars file

.github/workflows/enteprise.yml

@@ -184,8 +184,8 @@ jobs:
       matrix:
         molecule_scenario:
           - name: default
-            vars: vars-ubuntu20-73.yml
-            desc: EC2 ACS 7.3 (Ubuntu 20.04)
+            vars: vars-ubuntu22-73.yml
+            desc: EC2 ACS 7.3 (Ubuntu 22.04)
           - name: default
             vars: vars-rocky8.yml
             desc: EC2 ACS 7.4 (Rocky Linux 8.9)

.secrets.baseline

@@ -144,7 +144,7 @@
         "filename": "playbooks/acs.yml",
         "hashed_secret": "3a0b8a438a9efa61267357269709a946d797b9bd",
         "is_verified": false,
-        "line_number": 436,
+        "line_number": 447,
         "is_secret": false
       }
     ],
@@ -259,5 +259,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-28T09:32:21Z"
+  "generated_at": "2025-02-10T14:15:39Z"
 }

7.3.N-extra-vars.yml

@@ -1,3 +1,4 @@
+acs_major_version: 73
 acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise

7.4.N-extra-vars.yml

@@ -1,3 +1,4 @@
+acs_major_version: 74
 acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise

README.md

@@ -180,7 +180,7 @@ We expect distribution support to be added using mostly roles `vars` files. If
 distro specific tasks are needed those should be skipped for other distros
 and possibly added in separate task files.
 
-New distributions must be added to the `supported_os` variable in the `group_vars/all.yml` file.
+New distributions must be added to the `supported_os` variable in the `vars/acsXX.yml` files.
 
 If a new OS enters the official supported matrix but is not supported by the
 playbook. It must be mentioned in the [Versioning chapter of the

docs/playbook-upgrade.md

@@ -6,6 +6,14 @@ title: Upgrading the playbook
 
 ## Unreleased version
 
+### Handling of `supported_os` var
+
+The `supported_os` variable is being moved into version-specific variable files
+within the `vars/` directory. From this point forward, the `supported_os`
+variable will more accurately reflect the supported OS matrix. However, we
+reserve the right to specify newer distribution versions when testing
+compatibility or evaluating support for minor releases.
+
 ### Search Enterprise is the new default search engine
 
 The example inventories have been updated to default to Search Enterprise /

group_vars/all.yml

@@ -21,6 +21,7 @@ nexus_repository:
     {{ artifacts_repositories.enterprise.base_url }}/{{ artifacts_repositories.enterprise.repository }}/{{ artifacts_repositories.enterprise.group_id }}
   development_releases: >-
     {{ artifacts_repositories.enterprise.base_url }}/{{ artifacts_repositories.development.repository }}/{{ artifacts_repositories.enterprise.group_id }}
+acs_major_version: 23
 acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise
@@ -82,38 +83,6 @@ acc:
   artifact_name: alfresco-control-center
   repository: "{{ nexus_repository.releases }}"
   version: 9.3.0
-supported_os:
-  RedHat:
-    versions:
-      - 9.4
-      - 9.3
-      - 9.2
-      - 9.1
-      - 9.0
-      - 8.9
-      - 8.8
-      - 8.7
-      - 8.6
-      - 8.5
-      - 8.4
-      - 8.2
-  Rocky:
-    versions:
-      - 9.4
-      - 9.3
-      - 9.2
-      - 9.1
-      - 9.0
-      - 8.9
-      - 8.8
-      - 8.7
-      - 8.6
-  Ubuntu:
-    versions:
-      - 24.04
-      - 22.04
-      - 20.04
-      - 18.04
 downloads:
   acs_zip_url: >-
     {{ acs.repository }}/{{ acs.artifact_name }}/{{ acs.version }}/{{ acs.artifact_name }}-{{ acs.version }}.zip

molecule/default/vars-ubuntu22-73.yml

@@ -0,0 +1,4 @@
+MOLECULE_IT_IMAGE_ID: ami-032a56ad5e480189c # ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112
+MOLECULE_IT_EXTRA_VARS: 7.3.N-extra-vars.yml
+MOLECULE_IT_TEST_CONFIG: tests/test-config-7.3.json
+MOLECULE_IT_PLATFORM: ubuntu22-73

playbooks/acs.yml

@@ -1,4 +1,15 @@
 ---
+- name: Include vars based on acs major version
+  hosts: all
+  gather_facts: false
+  vars:
+    base_folder: "{{ playbook_dir }}/.."
+    vars_folder: "{{ base_folder }}/vars"
+    vars_file: "{{ vars_folder }}/acs{{ acs_major_version }}.yml"
+  tasks:
+    - name: Include vars based on acs major version
+      ansible.builtin.include_vars: "{{ vars_file }}"
+
 - name: Check if current OS version is in the supported matrix
   hosts: all:!external
   gather_facts: true

vars/acs23.yml

@@ -0,0 +1,19 @@
+supported_os:
+  RedHat:
+    versions:
+      - 9.5
+      - 9.4
+      - 9.3
+      - 8.10
+      - 8.9
+  Rocky:
+    versions:
+      - 9.5
+      - 9.4
+      - 9.3
+      - 8.10
+      - 8.9
+  Ubuntu:
+    versions:
+      - 22.04
+      - 24.04 # Testing for the upcoming 25.x acs version

vars/acs73.yml

@@ -0,0 +1,10 @@
+supported_os:
+  RedHat:
+    versions:
+      - 8.10
+      - 8.9
+      - 8.8
+      - 8.7
+  Ubuntu:
+    versions:
+      - 22.04

vars/acs74.yml

@@ -0,0 +1,18 @@
+supported_os:
+  RedHat:
+    versions:
+      - 8.10
+      - 8.9
+      - 8.8
+      - 8.7
+      - 8.6
+  Rocky:
+    versions:
+      - 8.10
+      - 8.9
+      - 8.8
+      - 8.7
+      - 8.6
+  Ubuntu:
+    versions:
+      - 22.04