Changes 3rd party installations & metadata for Ubuntu 24.x support

GoogleCloudPlatform · Nov 6, 2024 · 42f8a72 · 42f8a72
1 parent e953b42
commit 42f8a72
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 25 deletions.
diff --git a/integration_test/third_party_apps_test/applications/aerospike/debian_ubuntu/install b/integration_test/third_party_apps_test/applications/aerospike/debian_ubuntu/install
@@ -1,6 +1,6 @@
 set -e
 
-install_previous() {
+install_5() {
     # download, extract, install, and start aerospike community edition
     wget -O aerospike.tgz "https://download.aerospike.com/artifacts/aerospike-server-community/5.7.0.23/aerospike-server-community-5.7.0.23-$os_version.tgz"
     tar -xvf aerospike.tgz
@@ -11,13 +11,20 @@ install_previous() {
     (cd aerospike-tools-7.1.1-*/ && sudo ./asinstall)
 }
 
-install_current() {
+install_6() {
     # download, extract, install, and start aerospike community edition
     wget -O aerospike.tgz "https://download.aerospike.com/artifacts/aerospike-server-community/6.3.0.2/aerospike-server-community_6.3.0.2_tools-8.3.0_${os_version}_$(uname -m).tgz"
     tar -xvf aerospike.tgz
     (cd aerospike-server-community_6.3.0.2*/ && sudo ./asinstall)
 }
 
+install_7() {
+    # download, extract, install, and start aerospike community edition
+    wget -O aerospike.tgz "https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/aerospike-server-community_7.2.0.3_tools-11.1.0_${os_version}_$(uname -m).tgz"
+    tar -xvf aerospike.tgz
+    (cd aerospike-server-community_7.2.0.3*/ && sudo ./asinstall)
+}
+
 sudo apt-get update
 sudo apt-get install -y wget
 
@@ -38,6 +45,7 @@ case $ID in
             18*) ubuntu_version="ubuntu18.04";;
             20*) ubuntu_version="ubuntu20.04";;
             22*) ubuntu_version="ubuntu22.04";;
+            24*) ubuntu_version="ubuntu24.04";;
             *) echo "Found version: $VERSION_ID, supported versions are 18/20/22"
         esac
         os_version=$ubuntu_version
@@ -46,9 +54,11 @@ esac
 
 case $os_version in
     debian9|ubuntu18.04)
-        install_previous;;
+        install_5;;
     debian10|debian11|ubuntu20.04|ubuntu22.04)
-        install_current;;
+        install_6;;
+    ubuntu24.04)
+        install_7;;
     *)  echo "Found os_version: $os_version, not in supported list";;
 esac
 

diff --git a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml
@@ -162,4 +162,8 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-2410-arm64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64 # Possible support in the future
 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/debian_ubuntu/install b/integration_test/third_party_apps_test/applications/cassandra/debian_ubuntu/install
@@ -3,8 +3,8 @@ set -e
 curl https://downloads.apache.org/cassandra/KEYS --output /etc/apt/trusted.gpg.d/cassandra.asc
 
 source /etc/os-release
-if [[ "${VERSION_ID}" == 23* || "$(uname -m)" == aarch64 ]]; then
-    # There is a python dependency that fails for any older versions of cassandra on Ubuntu 23.04, so explicitly install Cassandra 4.1x.
+if [[ "${VERSION_ID}" =~ ^(20|22|23|24) || "$(uname -m)" == aarch64 ]]; then
+    # There is a python dependency that fails for any older versions of cassandra on < Ubuntu 20.04, so explicitly install Cassandra 4.1x.
     # Additionally, cassandra doesn't have arm64 binaries for 2.2x, but does for 4.1x.
     echo "deb https://debian.cassandra.apache.org 41x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
 

diff --git a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
@@ -50,10 +50,6 @@ 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
-  - ubuntu-os-cloud:ubuntu-2004-lts # GPG error [...] the public key is not available: NO_PUBKEY AA8E81B4331F7F50 NO_PUBKEY 112695A0E562B32A
-  - ubuntu-os-cloud:ubuntu-2204-lts # GPG error [...] the public key is not available: NO_PUBKEY AA8E81B4331F7F50 NO_PUBKEY 112695A0E562B32A
-  - ubuntu-os-cloud:ubuntu-2404-lts-amd64 # GPG error [...] the public key is not available: NO_PUBKEY AA8E81B4331F7F50 NO_PUBKEY 112695A0E562B32A
-  - ubuntu-os-cloud:ubuntu-2404-lts-arm64 # GPG error [...] the public key is not available: NO_PUBKEY AA8E81B4331F7F50 NO_PUBKEY 112695A0E562B32A
 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
@@ -68,6 +68,10 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-2410-arm64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64 # Possible support in the future
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
 supported_app_version: ["2.3.x", "3.1 and higher"]

diff --git a/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml b/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml
@@ -168,6 +168,10 @@ expected_metrics:
     unavailable_on:
       - ubuntu-os-cloud:ubuntu-2404-lts-amd64
       - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+      - ubuntu-os-cloud:ubuntu-2410-amd64
+      - ubuntu-os-cloud:ubuntu-minimal-2410-amd64
+      - ubuntu-os-cloud:ubuntu-2410-arm64
+      - ubuntu-os-cloud:ubuntu-minimal-2410-arm64
       - debian-cloud:debian-12-arm64
   - type: workload.googleapis.com/mysql.sorts
     value_type: INT64

diff --git a/integration_test/third_party_apps_test/applications/mongodb/debian_ubuntu/install b/integration_test/third_party_apps_test/applications/mongodb/debian_ubuntu/install
@@ -1,8 +1,8 @@
 set -e
 
+source /etc/os-release
 sudo apt-get update
-sudo apt-get install -y gnupg wget
-wget --no-verbose --output-document=/etc/apt/trusted.gpg.d/mongodb.asc https://www.mongodb.org/static/pgp/server-6.0.asc
+sudo apt-get install -y gnupg wget curl
 
 oscode="$(lsb_release -sc)"
 osname="$(lsb_release -si)"
@@ -17,11 +17,22 @@ if [[ "${osname}" == Debian && "${oscode}" == bullseye && "$(uname -m)" == aarch
   osname="Ubuntu"
 fi
 
+MONGO_VERSION=6.0.7
 case $osname in 
   Ubuntu)
-    echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu $oscode/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+    if [[ "${VERSION_ID}" =~ ^(24) ]]; then
+      MONGO_VERSION=8.0.0
+      curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | \
+        sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg \
+        --dearmor
+      echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu $oscode/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
+    else
+      wget --no-verbose --output-document=/etc/apt/trusted.gpg.d/mongodb.asc https://www.mongodb.org/static/pgp/server-6.0.asc
+      echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu $oscode/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+    fi
     ;;
   Debian)
+    wget --no-verbose --output-document=/etc/apt/trusted.gpg.d/mongodb.asc https://www.mongodb.org/static/pgp/server-6.0.asc
     echo "deb http://repo.mongodb.org/apt/debian $oscode/mongodb-org/6.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
     ;;
   *)
@@ -32,12 +43,12 @@ esac
 
 sudo apt-get update
 sudo apt-get install -y \
-    mongodb-org=6.0.7 \
-    mongodb-org-database=6.0.7 \
-    mongodb-org-server=6.0.7 \
-    mongodb-org-shell=6.0.7 \
-    mongodb-org-mongos=6.0.7 \
-    mongodb-org-tools=6.0.7
+    mongodb-org=${MONGO_VERSION} \
+    mongodb-org-database=${MONGO_VERSION} \
+    mongodb-org-server=${MONGO_VERSION} \
+    mongodb-org-shell=${MONGO_VERSION} \
+    mongodb-org-mongos=${MONGO_VERSION} \
+    mongodb-org-tools=${MONGO_VERSION}
 
 systemctl enable mongod
 

diff --git a/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml b/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml
@@ -34,8 +34,10 @@ minimum_supported_agent_version:
 supported_operating_systems: linux
 platforms_to_skip:
   # mongodb is not currently supported on various distros.
-  - ubuntu-os-cloud:ubuntu-2404-lts-amd64
-  - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-2410-arm64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64 # Possible support in the future
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
   - suse-cloud:sles-15-arm64

diff --git a/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml b/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml
@@ -51,6 +51,10 @@ platforms_to_skip:
   - ubuntu-os-cloud:ubuntu-2204-lts-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64
+  - ubuntu-os-cloud:ubuntu-2410-arm64
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64
 supported_app_version: ["2.6", "3.0+", "4.0+", "5.0"]
 expected_metrics:
   - type: workload.googleapis.com/mongodb.cache.operations

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
@@ -56,6 +56,10 @@ platforms_to_skip:
   - ubuntu-os-cloud:ubuntu-2204-lts-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64
+  - ubuntu-os-cloud:ubuntu-2410-arm64
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64
 supported_app_version: ["5.7", "8.0"]
 expected_metrics:
   - type: workload.googleapis.com/mysql.buffer_pool_data_pages

diff --git a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
@@ -68,6 +68,10 @@ platforms_to_skip:
   - ubuntu-os-cloud:ubuntu-2204-lts-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64
+  - ubuntu-os-cloud:ubuntu-2410-arm64
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64
 supported_app_version: ["12.2", "18c", "19c", "21c"]
 expected_metrics:
   - type: workload.googleapis.com/oracle.backup.latest

diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/debian_ubuntu/install b/integration_test/third_party_apps_test/applications/rabbitmq/debian_ubuntu/install
@@ -23,6 +23,12 @@ case $VERSION_ID in
   22.04)
     echo "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/rabbitmq.list
     ;;
+  24.04)
+    echo "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu noble main" | sudo tee /etc/apt/sources.list.d/rabbitmq.list
+    ;;
+  24.10)
+    echo "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu noble main" | sudo tee /etc/apt/sources.list.d/rabbitmq.list
+    ;;
   # debian
   10)
     echo "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main" | sudo tee /etc/apt/sources.list.d/rabbitmq.list

diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml b/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
@@ -36,8 +36,10 @@ supported_operating_systems: linux
 platforms_to_skip:
   # RabbitMQ is not supported on various distros.
   - suse-cloud:sles-12
-  - ubuntu-os-cloud:ubuntu-2404-lts-amd64
-  - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-2410-arm64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64 # Possible support in the future
 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/varnish/debian_ubuntu/install b/integration_test/third_party_apps_test/applications/varnish/debian_ubuntu/install
@@ -7,6 +7,7 @@ sudo apt-get update
 sudo apt-get install -y varnish nginx curl
 sudo systemctl enable --now varnish
 sudo systemctl enable --now nginx
+sudo systemctl enable --now varnishncsa
 
 # point varnish to nginx on port 80
 sudo tee /etc/varnish/default.vcl > /dev/null <<-EOF

diff --git a/integration_test/third_party_apps_test/applications/vault/metadata.yaml b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
@@ -69,8 +69,10 @@ configure_integration: |-
 supported_operating_systems: linux
 platforms_to_skip:
   # Vault is not supported on various distros.
-  - ubuntu-os-cloud:ubuntu-2404-lts-amd64
-  - ubuntu-os-cloud:ubuntu-2404-lts-arm64
+  - ubuntu-os-cloud:ubuntu-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-amd64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-2410-arm64 # Possible support in the future
+  - ubuntu-os-cloud:ubuntu-minimal-2410-arm64 # Possible support in the future
 supported_app_version: ["1.6+"]
 expected_metrics:
   - type: workload.googleapis.com/vault.core.request.count