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..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 @@ -1,7 +1,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 + JAVA_VERSION=21 +fi sudo yum install -y \ - curl java-1.8.0-openjdk java-1.8.0-openjdk-devel curl + 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 \ @@ -37,4 +44,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 07d20cbba8..f1d0ed7a49 100644 --- a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml @@ -165,6 +165,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 - ubuntu-os-cloud:ubuntu-2504-amd64 # aerospike not available for 25.04 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ 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..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 @@ -26,7 +26,10 @@ 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 +JAVA_VERSION=1.8.0 + +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 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 64b082adda..cad52ae8e8 100644 --- a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml @@ -52,6 +52,11 @@ platforms_to_skip: - debian-cloud:debian-13-arm64 # openjdk-11-jre not available on Debian 13. - 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/couchdb/metadata.yaml b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml index 076df1a817..0856a53089 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,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 - ubuntu-os-cloud:ubuntu-2504-amd64 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..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 @@ -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 @@ -26,7 +33,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/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/centos_rhel/install b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install index b8c6d91fb3..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,7 +1,8 @@ set -e -sudo yum -y install \ - java-1.8.0-openjdk java-1.8.0-openjdk-devel curl +JAVA_VERSION=1.8.0 + +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 @@ -12,7 +13,7 @@ sudo tar -xzf flink.tgz -C /opt/flink --strip-components 1 cat < /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 "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 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..b4d3baacd1 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/oracledb/metadata.yaml b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml index 31719c79ba..2e424f859d 100644 --- a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml @@ -63,6 +63,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/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..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,10 +1,12 @@ 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 9*) sudo yum config-manager --set-enabled crb;; + 10*) sudo yum config-manager --set-enabled crb;; esac sudo yum install -y curl epel-release @@ -17,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' 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 6551dfe564..e586c61542 100644 --- a/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml +++ b/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml @@ -38,6 +38,10 @@ platforms_to_skip: - debian-cloud:debian-13-arm64 # rabbitmq-server not available on Debian 13 yet: http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu/dists/ # 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 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 d7c233f393..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,6 +68,11 @@ configure_integration: |- ``` supported_operating_systems: linux platforms_to_skip: + # 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 supported_app_version: ["1.6+"] 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..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,8 +2,9 @@ import 'common.gcl' as common config build = common.third_party_apps_test { params { + platforms = ['rocky-linux-cloud:rocky-linux-10-arm64'] 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..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 = 'bullseye' + TARGET = 'rockylinux10' ARCH = 'x86_64' + SHORT = 'false' } } } diff --git a/project.yaml b/project.yaml index a88e1554db..3d83326f46 100644 --- a/project.yaml +++ b/project.yaml @@ -164,6 +164,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: diff --git a/submodules/fluent-bit b/submodules/fluent-bit index 2a1d3c5d7f..2f93e3fd86 160000 --- a/submodules/fluent-bit +++ b/submodules/fluent-bit @@ -1 +1 @@ -Subproject commit 2a1d3c5d7f5b4de13bb5fdb3ae7800e805eac775 +Subproject commit 2f93e3fd86e689abfc5804e730f588a2cda3a3ff diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector index ecd6f90d0e..d35ba01309 160000 --- a/submodules/opentelemetry-operations-collector +++ b/submodules/opentelemetry-operations-collector @@ -1 +1 @@ -Subproject commit ecd6f90d0ec49fbd735b59d90cb30bea12408964 +Subproject commit d35ba013090d92f7400fa5242fc919008ce69ef2