skip sp5 on all tests that skip base sles15

GoogleCloudPlatform · braydonk · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024 · Jul 17, 2024
commit c250c251e403224fc97baf683121dbeebf3e31db
diff --git a/integration_test/third_party_apps_test/applications/apache/metadata.yaml b/integration_test/third_party_apps_test/applications/apache/metadata.yaml
@@ -64,6 +64,7 @@ expected_metrics:
       - centos-cloud:centos-7
       - suse-cloud:sles-12
       - suse-cloud:sles-15
+      - suse-cloud:sles-15-sp5
       - suse-cloud:sles-15-arm64
   - type: workload.googleapis.com/apache.requests
     value_type: INT64
@@ -174,6 +175,7 @@ expected_logs:
           - centos-cloud:centos-7
           - suse-cloud:sles-12
           - suse-cloud:sles-15
+          - suse-cloud:sles-15-sp5
           - suse-cloud:sles-15-arm64
       - name: severity
         type: string

diff --git a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
@@ -51,6 +51,7 @@ platforms_to_skip:
   - centos-cloud:centos-7 # see https://issues.apache.org/jira/browse/CASSANDRA-18059 for fix.
   - suse-cloud:sles-12 # QueryLog() failed: cassandra_system not found, exhausted retries; QueryLog() failed: cassandra_debug not found, exhausted retries; QueryLog() failed: cassandra_gc not found, exhausted retries
   - suse-cloud:sles-15 # QueryLog() failed: cassandra_system not found, exhausted retries; QueryLog() failed: cassandra_debug not found, exhausted retries; QueryLog() failed: cassandra_gc not found, exhausted retries
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
   - debian-cloud:debian-12 # QueryLog() failed: cassandra_system not found, exhausted retries; QueryLog() failed: cassandra_debug not found, exhausted retries; QueryLog() failed: cassandra_gc not found, exhausted retries
   - debian-cloud:debian-12-arm64 # QueryLog() failed: cassandra_system not found, exhausted retries; QueryLog() failed: cassandra_debug not found, exhausted retries; QueryLog() failed: cassandra_gc not found, exhausted retries
@@ -182,7 +183,7 @@ expected_logs:
   - log_name: cassandra_gc
     fields:
       - name: jsonPayload.message
-        value_regex: (?s).*Total time for which application threads were stopped.* # The (?s) part will make the . match with newline as well. See https://github.com/google/re2/blob/main/doc/syntax.txt#L65,L68 
+        value_regex: (?s).*Total time for which application threads were stopped.* # The (?s) part will make the . match with newline as well. See https://github.com/google/re2/blob/main/doc/syntax.txt#L65,L68
         type: string
         description: Log message
       - name: jsonPayload.uptime

diff --git a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
@@ -31,6 +31,7 @@ platforms_to_skip:
   # couchdb is not supported on various distros.
   - suse-cloud:sles-12
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-arm64

diff --git a/integration_test/third_party_apps_test/applications/dcgm/metadata.yaml b/integration_test/third_party_apps_test/applications/dcgm/metadata.yaml
@@ -20,7 +20,7 @@ description: |-
   The NVIDIA DataCenter GPU Manager (DCGM) integration collects advanced GPU metrics,
   including SM block utilization, Pipe utilization, PCIe and NVLink traffic.
 configure_integration: |-
-  You must install DCGM and run the DCGM daemon service. 
+  You must install DCGM and run the DCGM daemon service.
 supported_operating_systems: linux
 supported_app_version: ["3.1"]
 gpu_platforms: # p4, p100 don't emit DCGM profiling metrics
@@ -41,6 +41,7 @@ gpu_platforms: # p4, p100 don't emit DCGM profiling metrics
       - rocky-linux-cloud:rocky-linux-8
       - rocky-linux-cloud:rocky-linux-9
       - suse-cloud:sles-15
+      - suse-cloud:sles-15-sp5
       - ubuntu-os-cloud:ubuntu-2004-lts
       - ubuntu-os-cloud:ubuntu-2204-lts
 expected_metrics:

diff --git a/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml b/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml
@@ -34,7 +34,7 @@ configure_integration: |-
 
   The `mysql_error` logging receiver collects logs from the default file paths
   shown in the table below. On some platforms, MariaDB logs to `journald` by
-  default instead of a file. Configure MariaDB to log to a file instead by 
+  default instead of a file. Configure MariaDB to log to a file instead by
   setting `log_error` in the MariaDB configuration.
   [Learn more](https://mariadb.com/kb/en/error-log/#writing-the-error-log-to-a-file)
   about configuring `log_error`.
@@ -48,6 +48,7 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-arm64
   - suse-cloud:sles-12
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
 supported_app_version: ["10.1.X through 10.7.X"]
 expected_metrics:

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
@@ -37,6 +37,7 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-arm64
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
   - ubuntu-os-cloud:ubuntu-2004-lts
   - ubuntu-os-cloud:ubuntu-2004-lts-arm64

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
@@ -35,6 +35,7 @@ supported_operating_systems: linux
 platforms_to_skip:
   # MySQL5.7 is not supported on various distros.
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
   - rocky-linux-cloud:rocky-linux-8
   - rocky-linux-cloud:rocky-linux-9

diff --git a/integration_test/third_party_apps_test/applications/nginx/metadata.yaml b/integration_test/third_party_apps_test/applications/nginx/metadata.yaml
@@ -116,6 +116,7 @@ supported_operating_systems: linux
 platforms_to_skip:
   - suse-cloud:sles-12 # QueryLog() failed: nginx_access not found, exhausted retries; QueryLog() failed: nginx_error not found, exhausted retries
   - suse-cloud:sles-15 # QueryLog() failed: nginx_access not found, exhausted retries; QueryLog() failed: nginx_error not found, exhausted retries
+  - suse-cloud:sles-15-sp5 # QueryLog() failed: nginx_access not found, exhausted retries; QueryLog() failed: nginx_error not found, exhausted retries
   - suse-cloud:sles-15-arm64 # QueryLog() failed: nginx_access not found, exhausted retries; QueryLog() failed: nginx_error not found, exhausted retries
   - ubuntu-os-cloud:ubuntu-2004-lts # QueryLog() failed: nginx_access not found, exhausted retries; QueryLog() failed: nginx_error not found, exhausted retries
 supported_app_version: ["1.18", "1.20"]

diff --git a/integration_test/third_party_apps_test/applications/nvml/metadata.yaml b/integration_test/third_party_apps_test/applications/nvml/metadata.yaml
@@ -20,7 +20,7 @@ description: |-
   The NVIDIA Management Library (or NVML) integration collects GPU utilization
   and GPU used memory metrics from NVIDIA GPUs.
 configure_integration: |-
-  You must install the NVIDIA driver on a host with NVIDIA GPUs. 
+  You must install the NVIDIA driver on a host with NVIDIA GPUs.
 supported_operating_systems: linux
 supported_app_version: ["515.65.01"]
 gpu_platforms:
@@ -49,6 +49,7 @@ gpu_platforms:
       - rocky-linux-cloud:rocky-linux-8
       - rocky-linux-cloud:rocky-linux-9
       - suse-cloud:sles-15
+      - suse-cloud:sles-15-sp5
       - ubuntu-os-cloud:ubuntu-2004-lts
       - ubuntu-os-cloud:ubuntu-2204-lts
 expected_metrics:

diff --git a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
@@ -59,6 +59,7 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-arm64
   - suse-cloud:sles-12
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
   - ubuntu-os-cloud:ubuntu-2004-lts
   - ubuntu-os-cloud:ubuntu-2004-lts-arm64

diff --git a/integration_test/third_party_apps_test/applications/redis/metadata.yaml b/integration_test/third_party_apps_test/applications/redis/metadata.yaml
@@ -32,6 +32,7 @@ platforms_to_skip:
   - centos-cloud:centos-7 # QueryLog() failed: redis not found, exhausted retries
   - suse-cloud:sles-12 # File '/repositories/server:/monitoring/SLE_12/server:monitoring.repo' not found
   - suse-cloud:sles-15 # File '/repositories/server:database/SLE_15/server:database.repo' not found
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
 supported_app_version: ["6.2"]
 expected_metrics:

diff --git a/integration_test/third_party_apps_test/applications/varnish/metadata.yaml b/integration_test/third_party_apps_test/applications/varnish/metadata.yaml
@@ -125,6 +125,7 @@ platforms_to_skip:
   # varnish is not supported on sles
   - suse-cloud:sles-12
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - suse-cloud:sles-15-arm64
 expected_logs:
   - log_name: varnish

diff --git a/integration_test/third_party_apps_test/applications/wildfly/metadata.yaml b/integration_test/third_party_apps_test/applications/wildfly/metadata.yaml
@@ -50,6 +50,7 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-8
   - suse-cloud:sles-12
   - suse-cloud:sles-15
+  - suse-cloud:sles-15-sp5
   - ubuntu-os-cloud:ubuntu-2004-lts
 supported_app_version: ["26.x", "25.x"]
 expected_metrics: