From 7e699290eaf686691bfdeee00e6c1fa3af121987 Mon Sep 17 00:00:00 2001
From: "Sangita.Nalkar" <Sangita.Nalkar@ibm.com>
Date: Mon, 5 Aug 2024 07:14:36 +0000
Subject: [PATCH] s390x support for Bazel

---
 MODULE.bazel                   | 12 ++++++++++--
 scripts/BUILD                  |  1 +
 src/test/shell/testenv.sh.tmpl |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index afabcbe5ff9f7b..89199577702842 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -252,6 +252,7 @@ use_repo(
     "remotejdk17_win",
     "remotejdk17_win_arm64",
     "remotejdk21_linux",
+    "remotejdk21_linux_s390x",
     "remotejdk21_macos",
     "remotejdk21_macos_aarch64",
     "remotejdk21_win",
@@ -262,12 +263,12 @@ use_repo(
 # =========================================
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python.toolchain(python_version = "3.8")
+python.toolchain(python_version = "3.10")
 
 pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
 pip.parse(
     hub_name = "bazel_pip_dev_deps",
-    python_version = "3.8",
+    python_version = "3.10",
     requirements_lock = "//:requirements.txt",
 )
 use_repo(pip, "bazel_pip_dev_deps")
@@ -326,6 +327,13 @@ http_file(
     urls = ["https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-arm64"],
 )
 
+http_file(
+    name = "jq_linux_s390x",
+    executable = True,
+    integrity = "sha256-hot8PKdCJKAt22EyYd38LkOxLart1etYNz29x/LF+SQ=",
+    urls = ["https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-s390x"],
+)
+
 http_file(
     name = "jq_macos_amd64",
     executable = True,
diff --git a/scripts/BUILD b/scripts/BUILD
index d25c00a925f455..e601c1e0dcf05f 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD
@@ -45,6 +45,7 @@ filegroup(
     srcs = select({
         "@platforms//cpu:arm64": ["@jq_linux_arm64//file"],
         "@platforms//cpu:x86_64": ["@jq_linux_amd64//file"],
+	"@platforms//cpu:s390x": ["@jq_linux_s390x//file"],
     }),
 )
 
diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl
index aad0a628f993ba..dedebde279127d 100755
--- a/src/test/shell/testenv.sh.tmpl
+++ b/src/test/shell/testenv.sh.tmpl
@@ -353,6 +353,7 @@ EOF
         "remotejdk17_win"
         "remotejdk17_win_arm64"
         "remotejdk21_linux"
+	"remotejdk21_linux_s390x"
         "remotejdk21_macos"
         "remotejdk21_macos_aarch64"
         "remotejdk21_win"