From 43649be6a0be210b9bff6858660dd7602c741796 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 25 Jun 2024 11:50:35 -0600
Subject: [PATCH] fix: add support for EL10

According to the Ansible team, support for listing platforms in
role `meta/main.yml` files is being removed.
Instead, they recommend using `galaxy_tags`

https://github.com/ansible/ansible/blob/stable-2.17/changelogs/CHANGELOG-v2.17.rst
"Remove the galaxy_info field platforms from the role templates"
https://github.com/ansible/ansible/issues/82453

Many roles already have tags such as "rhel", "redhat", "centos", and "fedora".
I propose that we ensure all of the system roles have these tags.
Some of our roles support Suse, Debian, Ubuntu, and others.
We should add tags for those e.g. the ssh role already has tags for "debian" and "ubuntu".

In addition - for each version listed under `platforms.EL` - add a tag like `elN`.

Q: Why not use a delimiter between the platform and the version e.g. `el-10`?

This is not allowed by ansible-lint:

```
meta-no-tags: Tags must contain lowercase letters and digits only., invalid: 'el-10'
meta/main.yml:1
```

So we cannot use uppercase letters either.

Q: Why not use our own meta/main.yml field?

No other fields are allowed by ansible-lint:

```
syntax-check[specific]: 'myfield' is not a valid attribute for a RoleMetadata
```

Q: Why not use some other field?

There are no other applicable or suitable fields.

Q: What happens when we want to support versions like `N.M`?

Use the word "dot" instead of "." e.g. `el10dot3`.
Similarly - use "dash" instead of "-".

We do not need tags such as `fedoraall`.
The `fedora` tag implies that the role works on all supported versions of fedora.
Otherwise, use tags such as `fedora40` if the role only supports specific versions.

In addition - for roles that have different variable files for EL9, create
the corresponding EL10 files.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
---
 .ostree/packages-testing-CentOS-10.txt | 16 ++++++++++++
 .ostree/packages-testing-RedHat-10.txt | 16 ++++++++++++
 meta/main.yml                          | 34 ++++++++++++--------------
 3 files changed, 47 insertions(+), 19 deletions(-)
 create mode 100644 .ostree/packages-testing-CentOS-10.txt
 create mode 100644 .ostree/packages-testing-RedHat-10.txt

diff --git a/.ostree/packages-testing-CentOS-10.txt b/.ostree/packages-testing-CentOS-10.txt
new file mode 100644
index 00000000..f6da445f
--- /dev/null
+++ b/.ostree/packages-testing-CentOS-10.txt
@@ -0,0 +1,16 @@
+bpftrace
+cyrus-sasl-scram
+grafana
+grafana-pcp
+pcp-export-pcp2elasticsearch
+pcp-pmda-bpftrace
+pcp-pmda-elasticsearch
+pcp-pmda-mssql
+pcp-pmda-postfix
+pcp-system-tools
+pcp-zeroconf
+postfix
+postfix-perl-scripts
+python3-pyodbc
+redis
+redis-doc
diff --git a/.ostree/packages-testing-RedHat-10.txt b/.ostree/packages-testing-RedHat-10.txt
new file mode 100644
index 00000000..f6da445f
--- /dev/null
+++ b/.ostree/packages-testing-RedHat-10.txt
@@ -0,0 +1,16 @@
+bpftrace
+cyrus-sasl-scram
+grafana
+grafana-pcp
+pcp-export-pcp2elasticsearch
+pcp-pmda-bpftrace
+pcp-pmda-elasticsearch
+pcp-pmda-mssql
+pcp-pmda-postfix
+pcp-system-tools
+pcp-zeroconf
+postfix
+postfix-perl-scripts
+python3-pyodbc
+redis
+redis-doc
diff --git a/meta/main.yml b/meta/main.yml
index e740204d..8c962f88 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -5,13 +5,7 @@ galaxy_info:
   description: Linux system role for metric collection
   company: Red Hat, Inc.
   license: MIT
-
   min_ansible_version: "2.9"
-
-  # If this is a Container Enabled role, provide the minimum Ansible Container
-  # version.
-  # min_ansible_container_version:
-
   platforms:
     - name: Fedora
       versions:
@@ -22,22 +16,24 @@ galaxy_info:
         - "7"
         - "8"
         - "9"
-
   galaxy_tags:
-    - metrics
     - analysis
-    - telemetry
-    - monitoring
-    - timeseries
-    - performance
-    - lightweight
-    - visualization
+    - el6
+    - el7
+    - el8
+    - el9
+    - el10
+    - fedora
+    - grafana
     - instrumentation
+    - lightweight
+    - metrics
+    - monitoring
     - observability
-    - grafana
-    - redis
     - pcp
-
+    - performance
+    - redis
+    - telemetry
+    - timeseries
+    - visualization
 dependencies: []
-# List your role dependencies here, one per line. Be sure to remove the '[]'
-# above, if you add dependencies to this list.