From 52727d047472f1349a1eb466bb55e192e20cf78a Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 19 Nov 2025 21:34:35 +0000 Subject: [PATCH 1/5] Hardcoding rhel9-sap images as representatinves --- project.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/project.yaml b/project.yaml index 8754e70a2f..c558188701 100644 --- a/project.yaml +++ b/project.yaml @@ -137,8 +137,16 @@ targets: test_distros: representative: - rocky-linux-cloud:rocky-linux-9 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha exhaustive: - rhel-cloud:rhel-9 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha - rocky-linux-cloud:rocky-linux-9-optimized-gcp aarch64: test_distros: @@ -180,7 +188,7 @@ targets: exhaustive: - suse-cloud:sles-15-sp6-arm64 - opensuse-cloud:opensuse-leap-arm64 - - opensuse-cloud=opensuse-leap-15-6-v20250724-arm64 + - opensuse-cloud=opensuse-leap-15-6-v20250724-arm64 windows: package_extension: goo From 758145dff0d6ad8e049476f2a04c2a34040a3480 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 19 Nov 2025 21:36:50 +0000 Subject: [PATCH 2/5] Removing from exaustive --- project.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/project.yaml b/project.yaml index c558188701..bc78084dd4 100644 --- a/project.yaml +++ b/project.yaml @@ -143,10 +143,6 @@ targets: - rhel-sap-cloud:rhel-9-6-sap-ha exhaustive: - rhel-cloud:rhel-9 - - rhel-sap-cloud:rhel-9-0-sap-ha - - rhel-sap-cloud:rhel-9-2-sap-ha - - rhel-sap-cloud:rhel-9-4-sap-ha - - rhel-sap-cloud:rhel-9-6-sap-ha - rocky-linux-cloud:rocky-linux-9-optimized-gcp aarch64: test_distros: From 2fe2c31c9dcd4cbc0f4b22585638843ca3298d5a Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Mon, 24 Nov 2025 20:20:32 +0000 Subject: [PATCH 3/5] Fixing some 3rd party --- .../applications/aerospike/metadata.yaml | 6 +++++- .../applications/couchdb/metadata.yaml | 4 ++++ .../applications/mariadb/metadata.yaml | 4 ++++ .../applications/mongodb3.6/metadata.yaml | 4 ++++ .../applications/mysql/centos_rhel/install | 2 ++ .../applications/mysql5.7/metadata.yaml | 4 ++++ .../applications/postgresql/metadata.yaml | 4 ---- 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml index 07d20cbba8..5b3c835f93 100644 --- a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml @@ -165,9 +165,13 @@ platforms_to_skip: - rocky-linux-cloud:rocky-linux-9-optimized-gcp - rocky-linux-cloud:rocky-linux-9-arm64 - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha - ubuntu-os-cloud:ubuntu-2404-lts-amd64 - ubuntu-os-cloud:ubuntu-2404-lts-arm64 - - ubuntu-os-cloud:ubuntu-2504-amd64 # aerospike not available for 25.04 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ + - ubuntu-os-cloud:ubuntu-2504-amd64 # aerospike not available for 25.04 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ - ubuntu-os-cloud:ubuntu-2504-arm64 # aerospike not available for 25.04 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ - ubuntu-os-cloud:ubuntu-2510-amd64 # aerospike not available for 25.10 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ - ubuntu-os-cloud:ubuntu-2510-arm64 # aerospike not available for 25.10 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ diff --git a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml index 076df1a817..94e071ec7b 100644 --- a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml @@ -68,6 +68,10 @@ platforms_to_skip: - rocky-linux-cloud:rocky-linux-9-optimized-gcp - rocky-linux-cloud:rocky-linux-9-arm64 - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha - ubuntu-os-cloud:ubuntu-2404-lts-amd64 - ubuntu-os-cloud:ubuntu-2404-lts-arm64 - ubuntu-os-cloud:ubuntu-2504-amd64 diff --git a/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml b/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml index b7f54999d7..4984dee23c 100644 --- a/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml @@ -55,6 +55,10 @@ platforms_to_skip: - rocky-linux-cloud:rocky-linux-9-optimized-gcp - rocky-linux-cloud:rocky-linux-9-arm64 - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha - suse-cloud:sles-12 - suse-cloud:sles-15 - suse-cloud:sles-15-arm64 diff --git a/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml b/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml index ea63f8c803..ff15bd39bd 100644 --- a/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml @@ -47,6 +47,10 @@ platforms_to_skip: - rocky-linux-cloud:rocky-linux-9-optimized-gcp - rocky-linux-cloud:rocky-linux-9-arm64 - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha - suse-cloud:sles-15 - suse-cloud:sles-15-arm64 - ubuntu-os-cloud:ubuntu-2204-lts diff --git a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install index 5e66f63f26..2823683c13 100644 --- a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install +++ b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install @@ -35,6 +35,8 @@ sudo chown mysql:mysql /var/log/mysql # Required to allow mysql to accept connections on 3307 if [ ${ID} == rocky ]; then sudo yum install -y policycoreutils-python-utils +elif [ ${ID} == rhel && VERSION_ID == 9 ]; then + sudo yum install -y policycoreutils-python-utils else sudo yum install -y policycoreutils-python fi diff --git a/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml b/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml index 4746f35cd7..816f71bc3e 100644 --- a/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml @@ -50,6 +50,10 @@ platforms_to_skip: - rocky-linux-cloud:rocky-linux-9-optimized-gcp - rocky-linux-cloud:rocky-linux-9-arm64 - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64 + - rhel-sap-cloud:rhel-9-0-sap-ha + - rhel-sap-cloud:rhel-9-2-sap-ha + - rhel-sap-cloud:rhel-9-4-sap-ha + - rhel-sap-cloud:rhel-9-6-sap-ha - debian-cloud:debian-11 - debian-cloud:debian-12 - debian-cloud:debian-12-arm64 diff --git a/integration_test/third_party_apps_test/applications/postgresql/metadata.yaml b/integration_test/third_party_apps_test/applications/postgresql/metadata.yaml index f420033cf0..31618f9b84 100644 --- a/integration_test/third_party_apps_test/applications/postgresql/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/postgresql/metadata.yaml @@ -32,10 +32,6 @@ supported_operating_systems: linux platforms_to_skip: # postgres is not supported on various distros. - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64 - - rocky-linux-cloud:rocky-linux-9 - - rocky-linux-cloud:rocky-linux-9-optimized-gcp - - rocky-linux-cloud:rocky-linux-9-arm64 - - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64 - suse-cloud:sles-15-arm64 supported_app_version: ["10.18+"] expected_metrics: From 25aa6496756389db1638dd2784cb4541bd687ed0 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Mon, 24 Nov 2025 20:21:30 +0000 Subject: [PATCH 4/5] Hardocing it back to test --- project.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project.yaml b/project.yaml index bc78084dd4..c1e4f7d554 100644 --- a/project.yaml +++ b/project.yaml @@ -136,13 +136,14 @@ targets: x86_64: test_distros: representative: - - rocky-linux-cloud:rocky-linux-9 + - rhel-sap-cloud:rhel-9-0-sap-ha - rhel-sap-cloud:rhel-9-2-sap-ha - rhel-sap-cloud:rhel-9-4-sap-ha - rhel-sap-cloud:rhel-9-6-sap-ha exhaustive: - rhel-cloud:rhel-9 + - rocky-linux-cloud:rocky-linux-9 - rocky-linux-cloud:rocky-linux-9-optimized-gcp aarch64: test_distros: From d5ae2c80f440a5a1cbcdf57d4a82a14172679e69 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 26 Nov 2025 16:01:58 +0000 Subject: [PATCH 5/5] Fix mysql trest --- .../applications/mysql/centos_rhel/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install index 2823683c13..58e0b7160f 100644 --- a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install +++ b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install @@ -33,9 +33,7 @@ sudo mkdir /var/log/mysql sudo chown mysql:mysql /var/log/mysql # Required to allow mysql to accept connections on 3307 -if [ ${ID} == rocky ]; then - sudo yum install -y policycoreutils-python-utils -elif [ ${ID} == rhel && VERSION_ID == 9 ]; then +if [[ ${ID} == rocky || (${ID} == rhel && ${VERSION_ID} == 9) ]]; then sudo yum install -y policycoreutils-python-utils else sudo yum install -y policycoreutils-python