From 4c3ab6ca00286b832a01808f7e166d0982d8d5c2 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:52:36 -0700
Subject: [PATCH] Reverting changes to ruby aarch64 build. (#10394)

* Reverting changes to ruby aarch64 build.

* Adding IN_DOCKER environment variable to prevent codegen

* Pass the cmake-built protoc to the ruby runner
---
 kokoro/linux/aarch64/test_ruby_aarch64.sh |  2 +-
 kokoro/linux/ruby_aarch64/build.sh        | 16 ++++++++++++++++
 kokoro/linux/ruby_aarch64/continuous.cfg  | 19 ++-----------------
 kokoro/linux/ruby_aarch64/presubmit.cfg   | 19 ++-----------------
 4 files changed, 21 insertions(+), 35 deletions(-)
 create mode 100755 kokoro/linux/ruby_aarch64/build.sh

diff --git a/kokoro/linux/aarch64/test_ruby_aarch64.sh b/kokoro/linux/aarch64/test_ruby_aarch64.sh
index 91ee5f288a48..e256e4edccea 100755
--- a/kokoro/linux/aarch64/test_ruby_aarch64.sh
+++ b/kokoro/linux/aarch64/test_ruby_aarch64.sh
@@ -24,4 +24,4 @@ kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh ko
 #   otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
 #   we just run map the user's home to a throwaway temporary directory
 
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/ruby:2.7.3-buster kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh
\ No newline at end of file
+docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -e "PROTOC=/work/protoc" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/ruby:2.7.3-buster kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh
diff --git a/kokoro/linux/ruby_aarch64/build.sh b/kokoro/linux/ruby_aarch64/build.sh
new file mode 100755
index 000000000000..6473e0d222ef
--- /dev/null
+++ b/kokoro/linux/ruby_aarch64/build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# This is the top-level script we give to Kokoro as the entry point for
+# running the "continuous" and "presubmit" jobs.
+
+set -ex
+
+# Change to repo root
+cd $(dirname $0)/../../..
+
+# Initialize any submodules.
+git submodule update --init --recursive
+
+kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
+
+kokoro/linux/aarch64/test_ruby_aarch64.sh
diff --git a/kokoro/linux/ruby_aarch64/continuous.cfg b/kokoro/linux/ruby_aarch64/continuous.cfg
index 044e8267afed..ae8269640495 100644
--- a/kokoro/linux/ruby_aarch64/continuous.cfg
+++ b/kokoro/linux/ruby_aarch64/continuous.cfg
@@ -1,26 +1,11 @@
 # Config file for running tests in Kokoro
 
 # Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
+build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
 timeout_mins: 120
 
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
 action {
   define_artifacts {
-    regex: "**/sponge_log.*"
+    regex: "**/sponge_log.xml"
   }
 }
diff --git a/kokoro/linux/ruby_aarch64/presubmit.cfg b/kokoro/linux/ruby_aarch64/presubmit.cfg
index 044e8267afed..ae8269640495 100644
--- a/kokoro/linux/ruby_aarch64/presubmit.cfg
+++ b/kokoro/linux/ruby_aarch64/presubmit.cfg
@@ -1,26 +1,11 @@
 # Config file for running tests in Kokoro
 
 # Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel.sh"
+build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
 timeout_mins: 120
 
-env_vars {
-  key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
-}
-
-env_vars {
-  key: "BAZEL_TARGETS"
-  value: "//ruby/..."
-}
-
-env_vars {
-  key: "BAZEL_EXTRA_FLAGS"
-  value: "--define=ruby_platform=c"
-}
-
 action {
   define_artifacts {
-    regex: "**/sponge_log.*"
+    regex: "**/sponge_log.xml"
   }
 }