From c3c83400304d7e9011eadc65cad601adde61c70f Mon Sep 17 00:00:00 2001
From: Sachin Itagi <sachin.itagi@ibm.com>
Date: Thu, 25 Apr 2024 08:54:44 +0000
Subject: [PATCH] Add Power and Z Support

---
 Containerfile        | 2 +-
 Taskfile.yml         | 4 ++--
 _build/test-setup.sh | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index 51d1cca..a0bbb5e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -26,7 +26,7 @@ COPY _build/devtools-publish /usr/local/bin/devtools-publish
 COPY _build/shells /etc/shells
 COPY _build/.bashrc /home/runner/.bashrc
 RUN \
-microdnf install --assumeyes ncurses && \
+microdnf install --assumeyes ncurses rustc cargo openssl openssl-devel && \
 microdnf clean all && \
 pip3 install --progress-bar=off \
 -r requirements.txt && \
diff --git a/Taskfile.yml b/Taskfile.yml
index 083c749..8448e13 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -45,7 +45,7 @@ tasks:
       - podman container prune -f
       - podman manifest exists {{.CNT_NAME_TAG}} && podman manifest rm {{.CNT_NAME_TAG}} || true
       - podman image exists {{.CNT_NAME_TAG}} && podman image rm -f {{.CNT_NAME_TAG}} || true
-      - podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64} --load {{.CNT_ROOT}} --manifest localhost/{{.CNT_NAME_TAG}}
+      - podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x} --load {{.CNT_ROOT}} --manifest localhost/{{.CNT_NAME_TAG}}
       # running manifest exists is mandatory as this fails if no manifest is
       # created locally. If this is skipped the inspect might pull the last
       # published manifest instead of using the local one.
@@ -93,7 +93,7 @@ tasks:
       - podman container prune -f
       - podman manifest exists {{.CNT_NAME_TAG}} && podman manifest rm {{.CNT_NAME_TAG}} || true
       - podman image exists {{.CNT_NAME_TAG}} && podman image rm -f {{.CNT_NAME_TAG}} || true
-      - podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64} --build-arg=CONTAINER_NAME={{.CNT_NAME_TAG}} --load {{.CNT_ROOT}} --manifest {{.CNT_NAME_TAG}}
+      - podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x} --build-arg=CONTAINER_NAME={{.CNT_NAME_TAG}} --load {{.CNT_ROOT}} --manifest {{.CNT_NAME_TAG}}
       # running manifest exists is mandatory as this fails if no manifest is
       # created locally. If this is skipped the inspect might pull the last
       # published manifest instead of using the local one.
diff --git a/_build/test-setup.sh b/_build/test-setup.sh
index d2c5540..ca1d964 100755
--- a/_build/test-setup.sh
+++ b/_build/test-setup.sh
@@ -151,6 +151,8 @@ fi
 # verify podman ability to execute multi-arch commands:
 podman run --arch=arm64 -qit bash arch
 podman run --arch=amd64 -qit bash arch
+podman run --arch=ppc64le -qit bash arch
+podman run --arch=s390x -qit bash arch
 
 # Create a build manifest so we can compare between builds and machines, this
 # also has the role of ensuring that the required executables are present.