Add s390x support (#198)

* Add s390x Support

Signed-off-by: Vishnu Bijukumar <vishnubijukumar@ibm.com>

* Add s390x Support(Update go base-image version)

Signed-off-by: Vishnu Bijukumar <vishnubijukumar@ibm.com>

* Add s390x Support(Update go base-image version)

Signed-off-by: Vishnu Bijukumar <vishnubijukumar@ibm.com>

* Update .github/workflows/pr.yml

Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

---------

Signed-off-by: Vishnu Bijukumar <vishnubijukumar@ibm.com>
Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>
Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

Author: vishnubijukumar

.github/workflows/pr.yml

@@ -31,6 +31,8 @@ jobs:
             name: arm64
           - runner: ubuntu-latest
             name: amd64
+          - runner: s390x
+            name: s390x
     steps:
       - uses: actions/checkout@v3
 

Makefile

@@ -6,7 +6,7 @@ IMAGE_REPO     ?= kedacore
 IMAGE_KEDA_TOOLS ?= $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-tools:$(KEDA_TOOLS_GO_VERSION)
 IMAGE_KEDA_K6_RUNNER ?= $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-k6-runner
 
-BUILD_PLATFORMS ?= linux/amd64,linux/arm64
+BUILD_PLATFORMS ?= linux/amd64,linux/arm64,linux/s390x
 
 IMAGE_TAG := $(shell git describe --always --abbrev=7)
 

k6-runner/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.22.12-alpine3.21 as builder
 WORKDIR $GOPATH/src/go.k6.io/k6
 RUN apk --no-cache add git
 

tools/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # Install prerequisite
 RUN apt update && \
@@ -57,16 +57,36 @@ ENV GOROOT=/usr/local/go
 ENV GOPATH=/go
 ENV PATH=${PATH}:${GOPATH}/bin
 
-# Install gh
-RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
-    apt update && \
-    apt install -y gh
+# Install GitHub CLI (gh)
+RUN ARCH=$(dpkg --print-architecture) && \
+    case "$ARCH" in \
+        "amd64" | "arm64") \
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
+            echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
+            apt update && \
+            apt install -y gh \
+        ;; \
+        "s390x") \
+            echo "deb http://ports.ubuntu.com/ubuntu-ports jammy universe" | tee /etc/apt/sources.list.d/gh.list > /dev/null && \
+            apt update && apt install -y gh \
+        ;; \
+        *) \
+            echo "Unsupported architecture: $ARCH" && exit 1 \
+        ;; \
+    esac
 
 # Protocol Buffer Compiler
+
 RUN PROTOC_VERSION=21.9 \
-    && if [ $(dpkg --print-architecture) = "amd64" ]; then PROTOC_ARCH="x86_64"; else PROTOC_ARCH="aarch_64" ; fi \
-    && curl -LO "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-$PROTOC_ARCH.zip" \
-    && unzip "protoc-${PROTOC_VERSION}-linux-$PROTOC_ARCH.zip" -d $HOME/.local \
+    && case $(dpkg --print-architecture) in \
+        "amd64") PROTOC_ARCH="x86_64" ;; \
+        "arm64") PROTOC_ARCH="aarch_64" ;; \
+        "s390x") PROTOC_ARCH="s390_64" ;; \
+        *) echo "Unsupported architecture"; exit 1 ;; \
+    esac \
+    && curl -LO "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-${PROTOC_ARCH}.zip" \
+    && unzip "protoc-${PROTOC_VERSION}-linux-${PROTOC_ARCH}.zip" -d $HOME/.local \
     && mv $HOME/.local/bin/protoc /usr/local/bin/protoc \
     && mv $HOME/.local/include/ /usr/local/bin/include/
+
+