From 032694fd5cd299a485bfe251eb90a9d3e8f401e7 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Mon, 15 Sep 2025 20:25:53 +0000
Subject: [PATCH 01/18] Adding rockylinux10 infra

---
 dockerfiles/compile.go                        |  3 ++-
 .../build/presubmit/bullseye_aarch64.gcl      |  4 ++--
 .../build/presubmit/bullseye_x86_64.gcl       |  4 ++--
 .../ops_agent/presubmit/bullseye_aarch64.gcl  |  2 +-
 .../presubmit/bullseye_aarch64_uap_plugin.gcl |  2 +-
 .../ops_agent/presubmit/bullseye_x86_64.gcl   |  2 +-
 .../presubmit/bullseye_x86_64_uap_plugin.gcl  |  2 +-
 .../presubmit/bullseye_aarch64.gcl            |  2 +-
 .../presubmit/bullseye_x86_64.gcl             |  2 +-
 project.yaml                                  | 19 +++++++++++++++++++
 10 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/dockerfiles/compile.go b/dockerfiles/compile.go
index aec64f4479..40550b8049 100644
--- a/dockerfiles/compile.go
+++ b/dockerfiles/compile.go
@@ -2,7 +2,8 @@
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// You may obtain a copy of the License atfv
+
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
diff --git a/kokoro/config/build/presubmit/bullseye_aarch64.gcl b/kokoro/config/build/presubmit/bullseye_aarch64.gcl
index cb5e05f6a9..06d59ecec9 100644
--- a/kokoro/config/build/presubmit/bullseye_aarch64.gcl
+++ b/kokoro/config/build/presubmit/bullseye_aarch64.gcl
@@ -3,8 +3,8 @@ import '../common.gcl' as common
 config build = common.build {
   params {
     environment {
-      DISTRO = 'bullseye'
-      PKGFORMAT = 'deb'
+      DISTRO = 'rockylinux10'
+      PKGFORMAT = 'rpm'
     }
   }
 }
diff --git a/kokoro/config/build/presubmit/bullseye_x86_64.gcl b/kokoro/config/build/presubmit/bullseye_x86_64.gcl
index cb5e05f6a9..06d59ecec9 100644
--- a/kokoro/config/build/presubmit/bullseye_x86_64.gcl
+++ b/kokoro/config/build/presubmit/bullseye_x86_64.gcl
@@ -3,8 +3,8 @@ import '../common.gcl' as common
 config build = common.build {
   params {
     environment {
-      DISTRO = 'bullseye'
-      PKGFORMAT = 'deb'
+      DISTRO = 'rockylinux10'
+      PKGFORMAT = 'rpm'
     }
   }
 }
diff --git a/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64.gcl b/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64.gcl
index ddcc738cfc..b358e4788a 100644
--- a/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'bullseye'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64_uap_plugin.gcl
index 56944baf1f..46cbf2e64d 100644
--- a/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64_uap_plugin.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/bullseye_aarch64_uap_plugin.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'bullseye'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
       IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
diff --git a/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64.gcl b/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64.gcl
index 98f521efb3..bb31a18cc7 100644
--- a/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'bullseye'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64_uap_plugin.gcl
index 254f9f6818..9ffa2dd218 100644
--- a/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64_uap_plugin.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/bullseye_x86_64_uap_plugin.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'bullseye'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
       IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
diff --git a/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl
index 74230b5ef5..7fc800327b 100644
--- a/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl
+++ b/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'bullseye'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl
index 251cc5f3d3..603d1437e2 100644
--- a/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl
+++ b/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'bullseye'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
     }
   }
diff --git a/project.yaml b/project.yaml
index ebb27503e2..72316d686f 100644
--- a/project.yaml
+++ b/project.yaml
@@ -117,6 +117,25 @@ targets:
           exhaustive:
           - rhel-cloud:rhel-9-arm64
           - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+  rockylinux10:
+    os_versions: [rocky-10*,rhel-10*]
+    package_extension:
+      rpm
+    repo_name:
+      el10
+    architectures:
+      x86_64:
+        test_distros:
+          representative:
+          - rocky-linux-cloud:rocky-linux-10
+          exhaustive:
+          - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+      aarch64:
+        test_distros:
+          representative:
+          - rocky-linux-cloud:rocky-linux-10-arm64
+          exhaustive:
+          - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   sles12:
     os_versions: [sles-12*]
     package_extension:

From d28b83b16dbb391514511bddbe1fa4c52743136f Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Thu, 18 Sep 2025 18:22:49 +0000
Subject: [PATCH 02/18] Wroking on 3rd party apps for rocky10

---
 .../applications/activemq/centos_rhel/install     | 11 ++++++++++-
 .../applications/aerospike/metadata.yaml          |  5 +++++
 .../applications/cassandra/centos_rhel/install    |  9 ++++++++-
 .../applications/couchdb/metadata.yaml            |  7 ++++++-
 .../elasticsearch/centos_rhel/install             | 10 ++++++++--
 .../applications/flink/centos_rhel/install        | 14 ++++++++++----
 .../applications/hadoop/centos_rhel/install       | 15 ++++++++++++---
 .../applications/hbase/centos_rhel/install        | 12 ++++++++++--
 .../applications/jetty/centos_rhel/install        | 11 ++++++++++-
 .../applications/jvm/centos_rhel/install          | 11 ++++++++++-
 .../applications/mariadb/metadata.yaml            |  4 ++++
 .../applications/mongodb/metadata.yaml            |  4 ++++
 .../applications/mongodb3.6/metadata.yaml         |  4 ++++
 .../applications/mysql/centos_rhel/install        |  8 +++++++-
 .../applications/mysql5.7/metadata.yaml           |  5 +++++
 .../applications/postgresql/centos_rhel/install   |  3 +++
 .../applications/rabbitmq/centos_rhel/install     |  1 +
 .../applications/redis/metadata.yaml              |  5 +++++
 .../applications/solr/centos_rhel/install         |  7 ++++++-
 .../applications/vault/metadata.yaml              |  6 ++++++
 .../presubmit/bullseye_aarch64.gcl                |  1 +
 .../presubmit/bullseye_x86_64.gcl                 |  2 ++
 22 files changed, 137 insertions(+), 18 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install b/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
index 40d4376f15..b24c1b0513 100644
--- a/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
@@ -1,8 +1,17 @@
 set -e
 
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y \
+    curl java-21-openjdk java-21-openjdk-devel curl
+elif
 sudo yum install -y \
     curl java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
 
+fi
+
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o \
     activemq.tar.gz \
@@ -37,4 +46,4 @@ sudo sed -i "s/$before/$after/g" /opt/activemq/bin/env
 
 sudo systemctl daemon-reload
 sudo systemctl enable activemq
-sudo systemctl restart activemq 
+sudo systemctl restart activemq
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 52bda9d157..87055d56b0 100644
--- a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml
@@ -162,6 +162,11 @@ 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
+  # repo not available for rh10
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
 public_url: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/third-party/aerospike
diff --git a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index 5ed861a668..58ec1d0e10 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -26,7 +26,14 @@ sudo mv cassandra.repo /etc/yum.repos.d/cassandra.repo
 
 sudo yum -y update
 
-sudo yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel cassandra
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y \
+    curl java-21-openjdk java-21-openjdk-devel cassandra
+elif
+  sudo yum install -y \
+    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel cassandra
+fi
 
 # Adjust stack size due to bigger page size on aarch64 architecture
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "8" && "$(uname -m)" == "aarch64" ]]; then
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 9950950fee..630c767bd9 100644
--- a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
@@ -64,10 +64,15 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-8-arm64
   - rhel-cloud:rhel-8-arm64
-  - rocky-linux-cloud:rocky-linux-9
+  - rocky-linux-cloud:rocky-linux-9s
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+  # repo not available for rh10
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
   - debian-cloud:debian-12
diff --git a/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install b/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
index 7a72af71ab..60993cb18b 100644
--- a/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
@@ -7,7 +7,13 @@ case "$VERSION_ID" in
     9*) sudo update-crypto-policies --set LEGACY;;
 esac
 
-sudo yum install -y java-1.8.0-openjdk
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y java-21-openjdk
+elif
+  sudo yum install -y java-1.8.0-openjdk
+fi
 
 sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
 
@@ -26,7 +32,7 @@ sudo mv elasticsearch.repo /etc/yum.repos.d/elasticsearch.repo
 sudo chown root:root /etc/yum.repos.d/elasticsearch.repo
 sudo chmod 0644 /etc/yum.repos.d/elasticsearch.repo
 
-sudo yum install -y --enablerepo=elasticsearch elasticsearch 
+sudo yum install -y --enablerepo=elasticsearch elasticsearch
 
 sudo systemctl daemon-reload
 sudo systemctl enable elasticsearch
diff --git a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
index b8c6d91fb3..0217f9fcd6 100644
--- a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
@@ -1,7 +1,13 @@
 set -e
 
-sudo yum -y install \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y java-21-openjdk java-21-openjdk-devel curl
+elif
+  sudo yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
+fi
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o flink.tgz https://storage.googleapis.com/ops-agents-public-buckets-vendored-deps/mirrored-content/archive.apache.org/dist/flink/flink-1.14.4/flink-1.14.4-bin-scala_2.11.tgz
@@ -12,7 +18,7 @@ sudo tar -xzf flink.tgz -C /opt/flink --strip-components 1
 cat <<EOF | sudo tee /etc/systemd/system/flink.service
 [Unit]
 Description=Apache Flink
-           
+
 [Service]
 Type=forking
 User=root
@@ -20,7 +26,7 @@ Group=root
 ExecStart=/opt/flink/bin/start-cluster.sh
 ExecStop=/opt/flink/bin/stop-cluster.sh
 Restart=always
-           
+
 [Install]
 WantedBy=default.target
 EOF
diff --git a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
index 6696ec3214..5892c2103e 100644
--- a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
@@ -1,7 +1,16 @@
 set -e
 
-sudo yum -y install \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y \
+    curl java-21-openjdk java-21-openjdk-devel wget
+elif
+  sudo yum install -y \
+    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+fi
 
 sudo mkdir -p \
     /opt/hadoop/logs \
@@ -143,5 +152,5 @@ sudo -u hadoop bash -c "source /opt/hadoop/env && hdfs namenode -format"
 
 sudo systemctl daemon-reload
 sudo systemctl enable hadoop
-sudo systemctl restart hadoop 
+sudo systemctl restart hadoop
 sleep 60
diff --git a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
index 4e710ec667..8542ae8dde 100644
--- a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
@@ -3,8 +3,16 @@ set -o pipefail
 
 HBASE_VERSION=2.4.11
 
-sudo yum -y install \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y \
+    curl java-21-openjdk java-21-openjdk-devel wget
+elif
+  sudo yum install -y \
+    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+fi
 
 sudo mkdir /opt/hbase
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
diff --git a/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install b/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
index d1861d4373..68ae79542d 100644
--- a/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
@@ -4,7 +4,16 @@ set -e
 # wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.46.v20220331/jetty-distribution-9.4.46.v20220331.tar.gz
 # wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/10.0.9/jetty-home-10.0.9.tar.gz
 
-sudo yum install -y wget java-11-openjdk-devel tzdata-java
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y java-21-openjdk-devel
+elif
+  sudo yum install -y java-11-openjdk-devel
+fi
+
+sudo yum install -y wget tzdata-java
 sudo wget -O jetty.tar.gz https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/11.0.9/jetty-home-11.0.9.tar.gz
 sudo mkdir -p /opt/jetty
 
diff --git a/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install b/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
index d4d3985f8d..99fb275b74 100644
--- a/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
@@ -1,6 +1,15 @@
 set -e
 
-sudo yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  sudo yum install -y \
+    curl java-21-openjdk java-21-openjdk-devel cassandra
+elif
+  sudo yum install -y \
+    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel
+fi
 
 # TODO(sophieyfang): Below file is the same across all distros.
 # Have a single source file to be copied across all distros.
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 664b680499..23ad0e88f1 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
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - suse-cloud:sles-12
   - suse-cloud:sles-15
   - suse-cloud:sles-15-arm64
diff --git a/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml b/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml
index b3ec36be50..7c22e5a661 100644
--- a/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml
@@ -37,6 +37,10 @@ platforms_to_skip:
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
   - suse-cloud:sles-15-arm64
+  - rocky-linux-cloud:rocky-linux-10 # No mongodb repo for rh10 yet
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["2.6", "3.x", "4.x", "5.0", "6.0"]
 expected_metrics:
   - type: workload.googleapis.com/mongodb.cache.operations
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 35280fb544..3831576fb6 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
@@ -45,6 +45,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
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - 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..0b40be692c 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
@@ -5,7 +5,13 @@ VERSION_ID=${VERSION_ID%%.*}
 
 sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
 sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
-sudo yum -y install https://repo.mysql.com/mysql80-community-release-el${VERSION_ID}.rpm
+
+MYSQL_VERSION="mysql80"
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  MYSQL_VERSION=mysql84
+fi
+
+sudo yum -y install https://repo.mysql.com/${MYSQL_VERSION}-community-release-el${VERSION_ID}.rpm
 
 if [ ${VERSION_ID} == 8 ]; then
   sudo yum -y module disable mysql
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 ed674856e2..fba812e16a 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,11 @@ 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
+  # repo not available for rh10
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - debian-cloud:debian-11
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
diff --git a/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install b/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
index 1aa5bf5471..9eccfe0071 100644
--- a/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
@@ -13,6 +13,9 @@ case "${VERSION_ID}" in
   9|9.*)
     sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     ;;
+  10|10.*)
+    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-10-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
+    ;;
   *)
     echo -n "unknown version"
     exit 1
diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
index c242f41f94..8224f8a674 100644
--- a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
@@ -5,6 +5,7 @@ source /etc/os-release
 # if os is rhel 9, crb is required to access epel
 case "$VERSION_ID" in
     9*) sudo yum config-manager --set-enabled crb;;
+    10*) sudo yum config-manager --set-enabled crb;;
 esac
 
 sudo yum install -y curl epel-release
diff --git a/integration_test/third_party_apps_test/applications/redis/metadata.yaml b/integration_test/third_party_apps_test/applications/redis/metadata.yaml
index 7f617c6ad4..5d07c8374f 100644
--- 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,11 @@ platforms_to_skip:
   - 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-arm64
+  # redis repo not available for rh10 yet
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["6.2"]
 expected_metrics:
   - type: workload.googleapis.com/redis.clients.blocked
diff --git a/integration_test/third_party_apps_test/applications/solr/centos_rhel/install b/integration_test/third_party_apps_test/applications/solr/centos_rhel/install
index 22408c2853..01138bbc3c 100644
--- a/integration_test/third_party_apps_test/applications/solr/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/solr/centos_rhel/install
@@ -9,8 +9,13 @@ SELINUX=disabled
 SELINUXTYPE=targeted
 EOF
 
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
 sudo yum install -y \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel curl lsof chkconfig
+    java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl lsof chkconfig
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o \
diff --git a/integration_test/third_party_apps_test/applications/vault/metadata.yaml b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
index 13ba7a9e14..13f21d5abf 100644
--- a/integration_test/third_party_apps_test/applications/vault/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
@@ -67,6 +67,12 @@ configure_integration: |-
   vault token create -field=token -policy prometheus-metrics > prometheus-token
   ```
 supported_operating_systems: linux
+platforms_to_skip:
+  # hashcorp repo not available for rh10
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["1.6+"]
 expected_metrics:
   - type: workload.googleapis.com/vault.core.request.count
diff --git a/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl
index 7fc800327b..5f10a589b6 100644
--- a/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl
+++ b/kokoro/config/test/third_party_apps/presubmit/bullseye_aarch64.gcl
@@ -2,6 +2,7 @@ import 'common.gcl' as common
 
 config build = common.third_party_apps_test {
   params {
+    platforms = ['rocky-linux-cloud:rocky-linux-10-arm64']
     environment {
       TARGET = 'rockylinux10'
       ARCH = 'aarch64'
diff --git a/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl
index 603d1437e2..7c08fc1c58 100644
--- a/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl
+++ b/kokoro/config/test/third_party_apps/presubmit/bullseye_x86_64.gcl
@@ -2,9 +2,11 @@ import 'common.gcl' as common
 
 config build = common.third_party_apps_test {
   params {
+    platforms = ['rocky-linux-cloud:rocky-linux-10']
     environment {
       TARGET = 'rockylinux10'
       ARCH = 'x86_64'
+      SHORT = 'false'
     }
   }
 }

From c88fb518d93cf1587a0bc1e54cc325f3548deeb4 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Thu, 18 Sep 2025 19:50:00 +0000
Subject: [PATCH 03/18] Fix typos and imporve code

---
 .../applications/activemq/centos_rhel/install         | 10 ++++------
 .../applications/cassandra/centos_rhel/install        | 11 +++++------
 .../applications/elasticsearch/centos_rhel/install    |  7 ++++---
 .../applications/flink/centos_rhel/install            |  7 ++++---
 .../applications/hadoop/centos_rhel/install           | 10 ++++------
 .../applications/hbase/centos_rhel/install            |  9 ++++-----
 .../applications/jetty/centos_rhel/install            |  7 ++++---
 .../applications/jvm/centos_rhel/install              | 10 +++++-----
 8 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install b/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
index b24c1b0513..5d9614bea0 100644
--- a/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
@@ -3,14 +3,12 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y \
-    curl java-21-openjdk java-21-openjdk-devel curl
-elif
-sudo yum install -y \
-    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
-
+  JAVA_VERSION=21
 fi
+sudo yum install -y \
+  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o \
diff --git a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index 58ec1d0e10..eb599d1200 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -26,15 +26,14 @@ sudo mv cassandra.repo /etc/yum.repos.d/cassandra.repo
 
 sudo yum -y update
 
-
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y \
-    curl java-21-openjdk java-21-openjdk-devel cassandra
-elif
-  sudo yum install -y \
-    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel cassandra
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y \
+  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel cassandra
+
 # Adjust stack size due to bigger page size on aarch64 architecture
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "8" && "$(uname -m)" == "aarch64" ]]; then
     sudo sed -i 's/-Xss256k/-Xss512k/' /etc/cassandra/default.conf/jvm-server.options
diff --git a/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install b/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
index 60993cb18b..51dbe501c8 100644
--- a/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
@@ -9,12 +9,13 @@ esac
 
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y java-21-openjdk
-elif
-  sudo yum install -y java-1.8.0-openjdk
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y java-${JAVA_VERSION}-openjdk
+
 sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
 
 cat << EOF > elasticsearch.repo
diff --git a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
index 0217f9fcd6..a6780b0b0b 100644
--- a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
@@ -3,12 +3,13 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y java-21-openjdk java-21-openjdk-devel curl
-elif
-  sudo yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y java-${JAVA_VERSION}openjdk java-${JAVA_VERSION}-openjdk-devel curl
+
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o flink.tgz https://storage.googleapis.com/ops-agents-public-buckets-vendored-deps/mirrored-content/archive.apache.org/dist/flink/flink-1.14.4/flink-1.14.4-bin-scala_2.11.tgz
 
diff --git a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
index 5892c2103e..17de2fc45d 100644
--- a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
@@ -3,15 +3,13 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
-
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y \
-    curl java-21-openjdk java-21-openjdk-devel wget
-elif
-  sudo yum install -y \
-    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y java-${JAVA_VERSION}openjdk java-${JAVA_VERSION}-openjdk-devel wget
+
 sudo mkdir -p \
     /opt/hadoop/logs \
     /opt/volume/datanode \
diff --git a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
index 8542ae8dde..a086d3ce14 100644
--- a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
@@ -6,14 +6,13 @@ HBASE_VERSION=2.4.11
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y \
-    curl java-21-openjdk java-21-openjdk-devel wget
-elif
-  sudo yum install -y \
-    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y java-${JAVA_VERSION}openjdk java-${JAVA_VERSION}-openjdk-devel wget
+
 sudo mkdir /opt/hbase
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 wget --no-verbose https://storage.googleapis.com/ops-agents-public-buckets-vendored-deps/mirrored-content/archive.apache.org/dist/hbase/"$HBASE_VERSION"/hbase-"$HBASE_VERSION"-bin.tar.gz
diff --git a/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install b/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
index 68ae79542d..c97c4e54c2 100644
--- a/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
@@ -7,12 +7,13 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
+JAVA_VERSION=11
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y java-21-openjdk-devel
-elif
-  sudo yum install -y java-11-openjdk-devel
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y java-${JAVA_VERSION}-openjdk-devel
+
 sudo yum install -y wget tzdata-java
 sudo wget -O jetty.tar.gz https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/11.0.9/jetty-home-11.0.9.tar.gz
 sudo mkdir -p /opt/jetty
diff --git a/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install b/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
index 99fb275b74..593b8be429 100644
--- a/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
@@ -3,14 +3,14 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
+JAVA_VERSION=1.8.0
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  sudo yum install -y \
-    curl java-21-openjdk java-21-openjdk-devel cassandra
-elif
-  sudo yum install -y \
-    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel
+  JAVA_VERSION=21
 fi
 
+sudo yum install -y \
+  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel
+
 # TODO(sophieyfang): Below file is the same across all distros.
 # Have a single source file to be copied across all distros.
 cat <<EOF > hello.java

From 0a1ce2f0e0eb578f760dd4d83dcd34690bdeffd7 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Thu, 18 Sep 2025 20:32:31 +0000
Subject: [PATCH 04/18] Fixing typos

---
 .../applications/flink/centos_rhel/install                      | 2 +-
 .../applications/hadoop/centos_rhel/install                     | 2 +-
 .../applications/hbase/centos_rhel/install                      | 2 +-
 .../applications/mysql/centos_rhel/install                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
index a6780b0b0b..5c9ba89215 100644
--- a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
@@ -8,7 +8,7 @@ if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
   JAVA_VERSION=21
 fi
 
-sudo yum install -y java-${JAVA_VERSION}openjdk java-${JAVA_VERSION}-openjdk-devel curl
+sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o flink.tgz https://storage.googleapis.com/ops-agents-public-buckets-vendored-deps/mirrored-content/archive.apache.org/dist/flink/flink-1.14.4/flink-1.14.4-bin-scala_2.11.tgz
diff --git a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
index 17de2fc45d..4efa572e50 100644
--- a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
@@ -8,7 +8,7 @@ if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
   JAVA_VERSION=21
 fi
 
-sudo yum install -y java-${JAVA_VERSION}openjdk java-${JAVA_VERSION}-openjdk-devel wget
+sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel wget
 
 sudo mkdir -p \
     /opt/hadoop/logs \
diff --git a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
index a086d3ce14..56e6e6666e 100644
--- a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
@@ -11,7 +11,7 @@ if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
   JAVA_VERSION=21
 fi
 
-sudo yum install -y java-${JAVA_VERSION}openjdk java-${JAVA_VERSION}-openjdk-devel wget
+sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel wget
 
 sudo mkdir /opt/hbase
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
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 0b40be692c..a941eed09e 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
@@ -1,7 +1,7 @@
 set -e
 
 source /etc/os-release
-VERSION_ID=${VERSION_ID%%.*}
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
 sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
 sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022

From 82465e867c6f4efe0a1000d6b294de4659c25a09 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Fri, 19 Sep 2025 16:31:39 +0000
Subject: [PATCH 05/18] Fixing 3rd prt apps

---
 .../applications/cassandra/centos_rhel/install              | 6 ++++--
 .../applications/flink/centos_rhel/install                  | 6 ------
 .../third_party_apps_test/applications/flink/metadata.yaml  | 5 +++++
 .../applications/mysql/centos_rhel/install                  | 4 ++--
 .../applications/oracledb/metadata.yaml                     | 4 ++++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index eb599d1200..d63a951669 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -7,10 +7,12 @@ GPGCHECK=1
 if [[ "$ID" == "rhel" && "$MAJOR_VERSION_ID" == "9" ]]; then
     # If OS is RHEL 9, support for legacy crypto is required to install GPG key
     sudo update-crypto-policies --set LEGACY
-elif [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "8" ]]; then
-    # If OS is Rocky Linux 8, legacy crypto isn't enough; need to disable GPG check
+elif [[ "$ID" == "rocky" ]]; then
+    if [[ "$MAJOR_VERSION_ID" == "8" || "$MAJOR_VERSION_ID" == "10" ]]
+    # If OS is Rocky Linux 8 or 10, legacy crypto isn't enough; need to disable GPG check
     # b/397661945
     GPGCHECK=0
+    fi
 fi
 
 sudo cat <<EOF > cassandra.repo
diff --git a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
index 5c9ba89215..ca5276f162 100644
--- a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
@@ -1,12 +1,6 @@
 set -e
 
-source /etc/os-release
-MAJOR_VERSION_ID=${VERSION_ID%%.*}
-
 JAVA_VERSION=1.8.0
-if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  JAVA_VERSION=21
-fi
 
 sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl
 
diff --git a/integration_test/third_party_apps_test/applications/flink/metadata.yaml b/integration_test/third_party_apps_test/applications/flink/metadata.yaml
index 5ee875db9c..31d3756b39 100644
--- a/integration_test/third_party_apps_test/applications/flink/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/flink/metadata.yaml
@@ -24,6 +24,11 @@ platforms_to_skip:
   # Flink only supports Java 11, which has no installation candidate for Debian 12
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
+  # Flink not working on java21
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["1.12.5", "1.13.6", "1.14.4"]
 configure_integration: ""
 expected_metrics:
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 a941eed09e..f93e74c249 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
@@ -11,9 +11,9 @@ if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
   MYSQL_VERSION=mysql84
 fi
 
-sudo yum -y install https://repo.mysql.com/${MYSQL_VERSION}-community-release-el${VERSION_ID}.rpm
+sudo yum -y install https://repo.mysql.com/${MYSQL_VERSION}-community-release-el${MAJOR_VERSION_ID}.rpm
 
-if [ ${VERSION_ID} == 8 ]; then
+if [ ${MAJOR_VERSION_ID} == 8 ]; then
   sudo yum -y module disable mysql
 fi
 sudo yum -y install mysql-community-server
diff --git a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
index 5a07f37d7d..b9979130ae 100644
--- a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
@@ -61,6 +61,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
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - suse-cloud:sles-12
   - suse-cloud:sles-15
   - suse-cloud:sles-15-arm64

From b33195af085372f322dc0af50dd61ecef0e147e0 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Fri, 19 Sep 2025 17:26:03 +0000
Subject: [PATCH 06/18] Typoes

---
 .../applications/cassandra/centos_rhel/install               | 2 +-
 .../applications/rabbitmq/centos_rhel/install                | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index d63a951669..d1f48bb09f 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -8,7 +8,7 @@ if [[ "$ID" == "rhel" && "$MAJOR_VERSION_ID" == "9" ]]; then
     # If OS is RHEL 9, support for legacy crypto is required to install GPG key
     sudo update-crypto-policies --set LEGACY
 elif [[ "$ID" == "rocky" ]]; then
-    if [[ "$MAJOR_VERSION_ID" == "8" || "$MAJOR_VERSION_ID" == "10" ]]
+    if [[ "$MAJOR_VERSION_ID" == "8" || "$MAJOR_VERSION_ID" == "10" ]]; then
     # If OS is Rocky Linux 8 or 10, legacy crypto isn't enough; need to disable GPG check
     # b/397661945
     GPGCHECK=0
diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
index 8224f8a674..50ad5f90c3 100644
--- a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
@@ -1,6 +1,7 @@
 set -e
 
 source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
 # if os is rhel 9, crb is required to access epel
 case "$VERSION_ID" in
@@ -18,12 +19,12 @@ if [[ "$(uname -m)" == aarch64 ]]; then
 else
   curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh --output erlang.rpm.sh
   chmod +x  erlang.rpm.sh
-  sudo os=el dist=8 ./erlang.rpm.sh
+  sudo os=el dist=${MAJOR_VERSION_ID} ./erlang.rpm.sh
 fi
 
 curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh --output rabbitmq-server.rpm.sh
 chmod +x  rabbitmq-server.rpm.sh
-sudo os=el dist=8 ./rabbitmq-server.rpm.sh
+sudo os=el dist=${MAJOR_VERSION_ID} ./rabbitmq-server.rpm.sh
 
 sudo yum makecache -y \
     --disablerepo='*' --enablerepo='rabbitmq_rabbitmq-server'

From 5f6dbb988f411ce1dce1b3ea6b6bb159dd97bf2e Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Fri, 19 Sep 2025 20:11:32 +0000
Subject: [PATCH 07/18] Removing ravbbi

---
 .../applications/cassandra/centos_rhel/install           | 9 ++-------
 .../applications/cassandra/metadata.yaml                 | 5 +++++
 .../applications/hbase/metadata.yaml                     | 5 +++++
 .../applications/rabbitmq/metadata.yaml                  | 4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index d1f48bb09f..0f86cf9b11 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -7,12 +7,10 @@ GPGCHECK=1
 if [[ "$ID" == "rhel" && "$MAJOR_VERSION_ID" == "9" ]]; then
     # If OS is RHEL 9, support for legacy crypto is required to install GPG key
     sudo update-crypto-policies --set LEGACY
-elif [[ "$ID" == "rocky" ]]; then
-    if [[ "$MAJOR_VERSION_ID" == "8" || "$MAJOR_VERSION_ID" == "10" ]]; then
-    # If OS is Rocky Linux 8 or 10, legacy crypto isn't enough; need to disable GPG check
+elif [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "8" ]]; then
+    # If OS is Rocky Linux 8, legacy crypto isn't enough; need to disable GPG check
     # b/397661945
     GPGCHECK=0
-    fi
 fi
 
 sudo cat <<EOF > cassandra.repo
@@ -29,9 +27,6 @@ sudo mv cassandra.repo /etc/yum.repos.d/cassandra.repo
 sudo yum -y update
 
 JAVA_VERSION=1.8.0
-if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  JAVA_VERSION=21
-fi
 
 sudo yum install -y \
   curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel cassandra
diff --git a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
index 5c16f21f21..be3ad5c1cd 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
@@ -50,6 +50,11 @@ supported_operating_systems: linux
 platforms_to_skip:
   - 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
+  # rocky-linux-10 - nothing provides (java-1.8.0-headless or java-11-headless) needed by cassandra-4.1.10-1.noarch from cassandra
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["3.11", "4.0"]
 expected_metrics:
   - type: workload.googleapis.com/cassandra.client.request.count
diff --git a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
index f8c03126e3..3af819990f 100644
--- a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
@@ -48,6 +48,11 @@ platforms_to_skip:
   # Hbase only supports Java 11, which has no installation candidate for Debian 12
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
+  # Non-retryable error: representative metric workload.googleapis.com/hbase.region_server.operation.append.latency.p99 not found, skipping remaining metrics
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_operating_systems: linux
 supported_app_version: ["1.7.x", "2.3.x", "2.4.x"]
 expected_metrics:
diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml b/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
index 45f5428aa8..9dde7074e5 100644
--- a/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
@@ -36,6 +36,10 @@ supported_operating_systems: linux
 platforms_to_skip:
   # RabbitMQ is not supported on various distros.
   - suse-cloud:sles-12
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["3.8", "3.9"]
 expected_metrics:
   - type: workload.googleapis.com/rabbitmq.consumer.count

From d1fe19f5ac12b4acd5965a58db51897bdc5b1fc6 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Mon, 22 Sep 2025 19:10:22 +0000
Subject: [PATCH 08/18] Attempt mysql fix

---
 .../third_party_apps_test/applications/couchdb/metadata.yaml | 2 +-
 .../applications/mysql/centos_rhel/install                   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 630c767bd9..6f3f91e530 100644
--- a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
@@ -64,7 +64,7 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-8-arm64
   - rhel-cloud:rhel-8-arm64
-  - rocky-linux-cloud:rocky-linux-9s
+  - 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
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 f93e74c249..52bd3121e4 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
@@ -18,8 +18,9 @@ if [ ${MAJOR_VERSION_ID} == 8 ]; then
 fi
 sudo yum -y install mysql-community-server
 
-echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
-
+if [ ${MAJOR_VERSION_ID} != 10 ]; then
+  echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
+fi
 sudo service mysqld start
 
 password=$(sudo grep -oP '(?<=temporary password is generated for root@localhost: ).*$' /var/log/mysqld.log)

From acdadfd9fabb0d00737d70ad8421ef563066d419 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Wed, 24 Sep 2025 15:29:05 +0000
Subject: [PATCH 09/18] Mysql fix attemp n

---
 .../applications/mysql/centos_rhel/install                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 52bd3121e4..b41525236e 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
@@ -18,7 +18,9 @@ if [ ${MAJOR_VERSION_ID} == 8 ]; then
 fi
 sudo yum -y install mysql-community-server
 
-if [ ${MAJOR_VERSION_ID} != 10 ]; then
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  echo "mysql_native_password=ON" | sudo tee -a /etc/my.cnf
+else
   echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
 fi
 sudo service mysqld start

From 09943b473cfc8bdc08ca35881c6cbef9eecd902c Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Wed, 24 Sep 2025 15:31:52 +0000
Subject: [PATCH 10/18] Revert dockerfile

---
 dockerfiles/compile.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dockerfiles/compile.go b/dockerfiles/compile.go
index 40550b8049..aec64f4479 100644
--- a/dockerfiles/compile.go
+++ b/dockerfiles/compile.go
@@ -2,8 +2,7 @@
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-// You may obtain a copy of the License atfv
-
+// You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //

From 92f8e7a1b4d2362ec59d08fd40eead88381d0a89 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Wed, 24 Sep 2025 16:56:01 +0000
Subject: [PATCH 11/18] Fixing commnad

---
 .../applications/mysql/exercise                   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index 9343a2cf5e..c1ddab15ad 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -20,6 +20,18 @@ user=root
 password='$password'
 EOF
 
+STATUS_COMMAND="SHOW MASTER STATUS;"
+VERSION_STRING=$(sudo mysql -sN -e "SELECT VERSION();" 2>/dev/null)
+VERSION_MAJOR=$(echo "$VERSION_STRING" | cut -d'.' -f1)
+VERSION_MINOR=$(echo "$VERSION_STRING" | cut -d'.' -f2)
+VERSION_PATCH=$(echo "$VERSION_STRING" | cut -d'.' -f3 | tr -d -c 0-9)
+
+# Logic to check if version is 8.0.22 or newer.
+if (( VERSION_MAJOR > 8 )) || (( VERSION_MAJOR == 8 && VERSION_MINOR > 0 )) ||
+    (( VERSION_MAJOR == 8 && VERSION_MINOR == 0 && VERSION_PATCH >= 22 )); then
+    STATUS_COMMAND="SHOW BINARY LOG STATUS;"
+fi
+
 sudo mysql --defaults-extra-file=config-user-2 -S /var/run/mysqld/mysql2.sock -Bse "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password
 
 # Create replication user
@@ -30,7 +42,8 @@ sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse
 sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
 
 # Capture status to seed replica
-raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;")
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "${STATUS_COMMAND};")
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "${STATUS_COMMAND};")
 read -r logfile logpos <<< $raw_status
 
 # Dump data from source into replica

From 82f11e0f567e17d08365cf1f1134bf29f619d715 Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Wed, 24 Sep 2025 18:04:08 +0000
Subject: [PATCH 12/18] Change command

---
 .../applications/mysql/exercise               | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index c1ddab15ad..f12a4bc8a6 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -20,27 +20,27 @@ user=root
 password='$password'
 EOF
 
+sudo mysql --defaults-extra-file=config-user-2 -S /var/run/mysqld/mysql2.sock -Bse "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password
+
+# Create replication user
+sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "CREATE USER 'repl'@'localhost' IDENTIFIED WITH mysql_native_password BY 'password';"
+sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'localhost';"
+
+# Dump data from replica source
+sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
+
 STATUS_COMMAND="SHOW MASTER STATUS;"
 VERSION_STRING=$(sudo mysql -sN -e "SELECT VERSION();" 2>/dev/null)
+sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SELECT VERSION();"
 VERSION_MAJOR=$(echo "$VERSION_STRING" | cut -d'.' -f1)
 VERSION_MINOR=$(echo "$VERSION_STRING" | cut -d'.' -f2)
 VERSION_PATCH=$(echo "$VERSION_STRING" | cut -d'.' -f3 | tr -d -c 0-9)
-
 # Logic to check if version is 8.0.22 or newer.
 if (( VERSION_MAJOR > 8 )) || (( VERSION_MAJOR == 8 && VERSION_MINOR > 0 )) ||
     (( VERSION_MAJOR == 8 && VERSION_MINOR == 0 && VERSION_PATCH >= 22 )); then
     STATUS_COMMAND="SHOW BINARY LOG STATUS;"
 fi
 
-sudo mysql --defaults-extra-file=config-user-2 -S /var/run/mysqld/mysql2.sock -Bse "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password
-
-# Create replication user
-sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "CREATE USER 'repl'@'localhost' IDENTIFIED WITH mysql_native_password BY 'password';"
-sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'localhost';"
-
-# Dump data from replica source
-sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
-
 # Capture status to seed replica
 raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "${STATUS_COMMAND};")
 raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "${STATUS_COMMAND};")

From 239296d1e7217cf735ffdd3f00762af209f14e9c Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Wed, 24 Sep 2025 18:31:27 +0000
Subject: [PATCH 13/18] Remove duped command

---
 .../third_party_apps_test/applications/mysql/exercise          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index f12a4bc8a6..7dd5bbe5b5 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -30,8 +30,7 @@ sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse
 sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
 
 STATUS_COMMAND="SHOW MASTER STATUS;"
-VERSION_STRING=$(sudo mysql -sN -e "SELECT VERSION();" 2>/dev/null)
-sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SELECT VERSION();"
+VERSION_STRING=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SELECT VERSION();" 2>/dev/null)
 VERSION_MAJOR=$(echo "$VERSION_STRING" | cut -d'.' -f1)
 VERSION_MINOR=$(echo "$VERSION_STRING" | cut -d'.' -f2)
 VERSION_PATCH=$(echo "$VERSION_STRING" | cut -d'.' -f3 | tr -d -c 0-9)

From a70f1ddd4a36fa6d70353e329f22ae654a3030dd Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Wed, 24 Sep 2025 19:05:28 +0000
Subject: [PATCH 14/18] Reworking condition

---
 .../applications/mysql/exercise                   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index 7dd5bbe5b5..979a660da9 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -29,20 +29,9 @@ sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse
 # Dump data from replica source
 sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
 
-STATUS_COMMAND="SHOW MASTER STATUS;"
-VERSION_STRING=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SELECT VERSION();" 2>/dev/null)
-VERSION_MAJOR=$(echo "$VERSION_STRING" | cut -d'.' -f1)
-VERSION_MINOR=$(echo "$VERSION_STRING" | cut -d'.' -f2)
-VERSION_PATCH=$(echo "$VERSION_STRING" | cut -d'.' -f3 | tr -d -c 0-9)
-# Logic to check if version is 8.0.22 or newer.
-if (( VERSION_MAJOR > 8 )) || (( VERSION_MAJOR == 8 && VERSION_MINOR > 0 )) ||
-    (( VERSION_MAJOR == 8 && VERSION_MINOR == 0 && VERSION_PATCH >= 22 )); then
-    STATUS_COMMAND="SHOW BINARY LOG STATUS;"
-fi
-
 # Capture status to seed replica
-raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "${STATUS_COMMAND};")
-raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "${STATUS_COMMAND};")
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
 read -r logfile logpos <<< $raw_status
 
 # Dump data from source into replica

From c344f69f05f487526892b4339a2d2839fd239d8f Mon Sep 17 00:00:00 2001
From: Rafael Westphal <westphalrafael@google.com>
Date: Fri, 26 Sep 2025 12:58:36 -0400
Subject: [PATCH 15/18] Update
 integration_test/third_party_apps_test/applications/vault/metadata.yaml

Co-authored-by: Francisco Valente Castro <1435136+franciscovalentecastro@users.noreply.github.com>
---
 .../third_party_apps_test/applications/vault/metadata.yaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration_test/third_party_apps_test/applications/vault/metadata.yaml b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
index 13f21d5abf..f022f3d127 100644
--- a/integration_test/third_party_apps_test/applications/vault/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
@@ -68,7 +68,7 @@ configure_integration: |-
   ```
 supported_operating_systems: linux
 platforms_to_skip:
-  # hashcorp repo not available for rh10
+  # hashicorp repo not available for rh10
   - rocky-linux-cloud:rocky-linux-10
   - rocky-linux-cloud:rocky-linux-10-optimized-gcp
   - rocky-linux-cloud:rocky-linux-10-arm64

From e3848a72385b3439ae6c8a82ea2f06befe0503cf Mon Sep 17 00:00:00 2001
From: Lujie Duan <lujieduan@google.com>
Date: Thu, 30 Oct 2025 18:23:37 +0000
Subject: [PATCH 16/18] Fix elasticsearch9 installation on RL10

---
 .../applications/elasticsearch9/centos_rhel/install    |  9 ++++++++-
 .../applications/flink/metadata.yaml                   |  4 ++--
 .../applications/hbase/metadata.yaml                   | 10 +++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/elasticsearch9/centos_rhel/install b/integration_test/third_party_apps_test/applications/elasticsearch9/centos_rhel/install
index 3fe3ed4d63..734df459e2 100644
--- a/integration_test/third_party_apps_test/applications/elasticsearch9/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/elasticsearch9/centos_rhel/install
@@ -7,7 +7,14 @@ case "$VERSION_ID" in
     9*) sudo update-crypto-policies --set LEGACY;;
 esac
 
-sudo yum install -y java-1.8.0-openjdk
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
+sudo yum install -y java-${JAVA_VERSION}-openjdk
 
 sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
 
diff --git a/integration_test/third_party_apps_test/applications/flink/metadata.yaml b/integration_test/third_party_apps_test/applications/flink/metadata.yaml
index b914110b11..63ee5bd2b5 100644
--- a/integration_test/third_party_apps_test/applications/flink/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/flink/metadata.yaml
@@ -24,13 +24,13 @@ platforms_to_skip:
   # Flink only supports Java 11, which has no installation candidate for Debian 12 and 13.
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
+  - debian-cloud:debian-13
+  - debian-cloud:debian-13-arm64
   # Flink not working on java21
   - rocky-linux-cloud:rocky-linux-10
   - rocky-linux-cloud:rocky-linux-10-optimized-gcp
   - rocky-linux-cloud:rocky-linux-10-arm64
   - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
-  - debian-cloud:debian-13
-  - debian-cloud:debian-13-arm64
 supported_app_version: ["1.12.5", "1.13.6", "1.14.4"]
 configure_integration: ""
 expected_metrics:
diff --git a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
index 03455b241e..54b2bcfe67 100644
--- a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
@@ -48,13 +48,13 @@ platforms_to_skip:
   # Hbase only supports Java 11, which has no installation candidate for Debian 12 and 13.
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
-  # Non-retryable error: representative metric workload.googleapis.com/hbase.region_server.operation.append.latency.p99 not found, skipping remaining metrics
-  - rocky-linux-cloud:rocky-linux-10
-  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
-  - rocky-linux-cloud:rocky-linux-10-arm64
-  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - debian-cloud:debian-13
   - debian-cloud:debian-13-arm64
+  # # Non-retryable error: representative metric workload.googleapis.com/hbase.region_server.operation.append.latency.p99 not found, skipping remaining metrics
+  # - rocky-linux-cloud:rocky-linux-10
+  # - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  # - rocky-linux-cloud:rocky-linux-10-arm64
+  # - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_operating_systems: linux
 supported_app_version: ["1.7.x", "2.3.x", "2.4.x"]
 expected_metrics:

From d2ae979ffe18aab049ce23ec39e6fbbcad5eb10f Mon Sep 17 00:00:00 2001
From: Lujie Duan <lujieduan@google.com>
Date: Tue, 4 Nov 2025 19:11:46 +0000
Subject: [PATCH 17/18] Remove HBase changes and skip Hbase since no supported
 Java is avaialble for RL10

---
 .../applications/hbase/centos_rhel/install           | 12 +++---------
 .../applications/hbase/metadata.yaml                 | 10 +++++-----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
index 56e6e6666e..4c8628b345 100644
--- a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
@@ -3,15 +3,9 @@ set -o pipefail
 
 HBASE_VERSION=2.4.11
 
-source /etc/os-release
-MAJOR_VERSION_ID=${VERSION_ID%%.*}
-
-JAVA_VERSION=1.8.0
-if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  JAVA_VERSION=21
-fi
-
-sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel wget
+# Hbase and Java compatibility: https://hbase.apache.org/book.html#java
+sudo yum -y install \
+    java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
 
 sudo mkdir /opt/hbase
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
diff --git a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
index 54b2bcfe67..093064ba32 100644
--- a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
@@ -50,11 +50,11 @@ platforms_to_skip:
   - debian-cloud:debian-12-arm64
   - debian-cloud:debian-13
   - debian-cloud:debian-13-arm64
-  # # Non-retryable error: representative metric workload.googleapis.com/hbase.region_server.operation.append.latency.p99 not found, skipping remaining metrics
-  # - rocky-linux-cloud:rocky-linux-10
-  # - rocky-linux-cloud:rocky-linux-10-optimized-gcp
-  # - rocky-linux-cloud:rocky-linux-10-arm64
-  # - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
+  # Same as above, RL10 only has Java 21 which is not supported by HBase
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_operating_systems: linux
 supported_app_version: ["1.7.x", "2.3.x", "2.4.x"]
 expected_metrics:

From 3bdf1d647950076604eb6e517f039e79e5d90407 Mon Sep 17 00:00:00 2001
From: braydonk <braydonk@google.com>
Date: Tue, 9 Dec 2025 15:58:04 +0000
Subject: [PATCH 18/18] sometimes vscode doesn't save when I press save and I
 want to throw it in the garbage

---
 .../third_party_apps_test/applications/vault/metadata.yaml     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/vault/metadata.yaml b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
index bd5871dfaa..b216f183ea 100644
--- a/integration_test/third_party_apps_test/applications/vault/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
@@ -68,16 +68,13 @@ configure_integration: |-
   ```
 supported_operating_systems: linux
 platforms_to_skip:
-<<<<<<< HEAD
   # hashicorp repo not available for rh10
   - rocky-linux-cloud:rocky-linux-10
   - rocky-linux-cloud:rocky-linux-10-optimized-gcp
   - rocky-linux-cloud:rocky-linux-10-arm64
   - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
-=======
   - ubuntu-os-cloud:ubuntu-2510-amd64 # vault not available for 25.10 yet: https://www.hashicorp.com/en/official-packaging-guide
   - ubuntu-os-cloud:ubuntu-2510-arm64 # vault not available for 25.10 yet: https://www.hashicorp.com/en/official-packaging-guide
->>>>>>> master
 supported_app_version: ["1.6+"]
 expected_metrics:
   - type: workload.googleapis.com/vault.core.request.count