Testing Rhel 8 arm 3p Tests (#1803)

GoogleCloudPlatform · Oct 4, 2024 · 569d9f4 · 569d9f4
1 parent 7f8f62d
commit 569d9f4
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 27 deletions.
diff --git a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml
@@ -155,6 +155,7 @@ platforms_to_skip:
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
   - suse-cloud:sles-12
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

diff --git a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
@@ -61,6 +61,7 @@ platforms_to_skip:
   - suse-cloud:sles-12
   - suse-cloud:sles-15
   - suse-cloud:sles-15-arm64
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

diff --git a/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml b/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml
@@ -48,6 +48,7 @@ platforms_to_skip:
   - centos-cloud:centos-7
   - rocky-linux-cloud:rocky-linux-8
   - rocky-linux-cloud:rocky-linux-8-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

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
@@ -38,6 +38,7 @@ platforms_to_skip:
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
   - ml-images:common-gpu-debian-11-py310
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

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
@@ -41,6 +41,7 @@ platforms_to_skip:
   - suse-cloud:sles-15-arm64
   - rocky-linux-cloud:rocky-linux-8
   - rocky-linux-cloud:rocky-linux-8-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

diff --git a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
@@ -54,6 +54,7 @@ platforms_to_skip:
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
   - ml-images:common-gpu-debian-11-py310
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

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
@@ -1,16 +1,17 @@
 set -e
 
 source /etc/os-release
+ARCH=$(uname -m)
 case "${VERSION_ID}" in
   7)
-    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     ;;
   8|8.*)
-    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     sudo yum -qy module disable postgresql
     ;;
   9|9.*)
-    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     ;;
   *)
     echo -n "unknown version"

diff --git a/integration_test/third_party_apps_test/applications/postgresql/metadata.yaml b/integration_test/third_party_apps_test/applications/postgresql/metadata.yaml
@@ -31,6 +31,7 @@ minimum_supported_agent_version:
 supported_operating_systems: linux
 platforms_to_skip:
   # postgres is not supported on various distros.
+  - rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64
   - rocky-linux-cloud:rocky-linux-9
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64

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
@@ -10,30 +10,19 @@ esac
 sudo yum install -y curl epel-release
 
 # until there is a rabbitmq-server package for rhel 9, use the el8 package
-case "$VERSION_ID" in
-    9*)
-        if [[ "$(uname -m)" == aarch64 ]]; then
-          # until the packagecloud.io erlang package has an option for aarch64
-          curl -sfL -O https://github.com/rabbitmq/erlang-rpm/releases/download/v26.0.2/erlang-26.0.2-1.el8.aarch64.rpm
-          sudo dnf install -y ./erlang-26.0.2-1.el8.aarch64.rpm
-        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
-        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
-        ;;
-    *)
-        curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | sudo bash
-
-        curl -s \
-            https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | \
-            sudo bash
-        ;;
-esac
+if [[ "$(uname -m)" == aarch64 ]]; then
+  # until the packagecloud.io erlang package has an option for aarch64
+  curl -sfL -O https://github.com/rabbitmq/erlang-rpm/releases/download/v26.0.2/erlang-26.0.2-1.el8.aarch64.rpm
+  sudo dnf install -y ./erlang-26.0.2-1.el8.aarch64.rpm
+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
+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 yum makecache -y \
     --disablerepo='*' --enablerepo='rabbitmq_rabbitmq-server'

diff --git a/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl b/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}