From 7e51cf75aa02e919654df07df037d3ddfca55b0a Mon Sep 17 00:00:00 2001
From: Brice Rising <brice@algorand.com>
Date: Fri, 10 Sep 2021 14:21:28 -0400
Subject: [PATCH 1/4] Add ability to overwrite os/arch

---
 scripts/archtype.sh | 5 +++++
 scripts/ostype.sh   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/scripts/archtype.sh b/scripts/archtype.sh
index 6c7c6a8f2c..cc241c82f7 100755
--- a/scripts/archtype.sh
+++ b/scripts/archtype.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [ ! -z "${GOHOSTARCH+x}" ]; then
+    echo "${GOHOSTARCH}"
+    exit 0
+fi
+
 ARCH=$(uname -m)
 
 if [[ "${ARCH}" = "x86_64" ]]; then
diff --git a/scripts/ostype.sh b/scripts/ostype.sh
index f3f16a45b7..bf24462139 100755
--- a/scripts/ostype.sh
+++ b/scripts/ostype.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [ ! -z "${GOHOSTOS+x}" ]; then
+    echo "${GOHOSTOS}"
+    exit 0
+fi
+
 UNAME=$(uname)
 
 if [ "${UNAME}" = "Darwin" ]; then

From c2e5ed416381fe11aeb64cc58b57a0f6f49a5746 Mon Sep 17 00:00:00 2001
From: Brice Rising <brice@algorand.com>
Date: Fri, 10 Sep 2021 14:37:27 -0400
Subject: [PATCH 2/4] Update mule.yaml to set go env vars

---
 test/muleCI/mule.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/muleCI/mule.yaml b/test/muleCI/mule.yaml
index 0ec2ac2770..954e121b98 100644
--- a/test/muleCI/mule.yaml
+++ b/test/muleCI/mule.yaml
@@ -35,6 +35,7 @@ agents:
       - NETWORK=$NETWORK
       - VERSION=$VERSION
       - BUILD_NUMBER=$BUILD_NUMBER
+      - GOHOSTARCH=arm64
     buildArgs:
       - GOLANG_VERSION=`./scripts/get_golang_version.sh`
       - ARCH=arm64v8
@@ -48,6 +49,7 @@ agents:
       - NETWORK=$NETWORK
       - VERSION=$VERSION
       - BUILD_NUMBER=$BUILD_NUMBER
+      - GOHOSTARCH=arm
     buildArgs:
       - GOLANG_VERSION=`./scripts/get_golang_version.sh`
       - ARCH=arm32v6
@@ -195,11 +197,11 @@ jobs:
   build-linux-arm64:
     tasks:
       - docker.Make.build.arm64
-      - stash.Stash.linux-arm64
+      #- stash.Stash.linux-arm64
   build-linux-arm32:
     tasks:
       - docker.Make.build.arm
-      - stash.Stash.linux-arm
+      #- stash.Stash.linux-arm
   package-linux-amd64:
     tasks:
       - stash.Unstash.linux-amd64

From 40717310588a99f8165ec2416019dfefb08960eb Mon Sep 17 00:00:00 2001
From: Brice Rising <brice@algorand.com>
Date: Mon, 13 Sep 2021 15:42:28 -0400
Subject: [PATCH 3/4] Uncomment stashing steps

---
 test/muleCI/mule.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/muleCI/mule.yaml b/test/muleCI/mule.yaml
index 954e121b98..a68d1a2ca5 100644
--- a/test/muleCI/mule.yaml
+++ b/test/muleCI/mule.yaml
@@ -197,11 +197,11 @@ jobs:
   build-linux-arm64:
     tasks:
       - docker.Make.build.arm64
-      #- stash.Stash.linux-arm64
+      - stash.Stash.linux-arm64
   build-linux-arm32:
     tasks:
       - docker.Make.build.arm
-      #- stash.Stash.linux-arm
+      - stash.Stash.linux-arm
   package-linux-amd64:
     tasks:
       - stash.Unstash.linux-amd64

From ba4e1ad18819de6e417c7befd60c06d34b5a4d08 Mon Sep 17 00:00:00 2001
From: Brice Rising <brice@algorand.com>
Date: Tue, 14 Sep 2021 10:52:57 -0400
Subject: [PATCH 4/4] Bump mule version and add arch variables to all agents

---
 test/muleCI/Jenkinsfile | 2 +-
 test/muleCI/mule.yaml   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/muleCI/Jenkinsfile b/test/muleCI/Jenkinsfile
index ff8a41ec42..7f4d5a2198 100644
--- a/test/muleCI/Jenkinsfile
+++ b/test/muleCI/Jenkinsfile
@@ -1,3 +1,3 @@
 @Library('go-algorand-ci') _
 
-muleCI('test/muleCI/mule.yaml', '0.0.12')
+muleCI('test/muleCI/mule.yaml', '0.0.23')
diff --git a/test/muleCI/mule.yaml b/test/muleCI/mule.yaml
index a68d1a2ca5..2f4e3af806 100644
--- a/test/muleCI/mule.yaml
+++ b/test/muleCI/mule.yaml
@@ -9,6 +9,7 @@ agents:
       - NETWORK=$NETWORK
       - VERSION=$VERSION
       - BUILD_NUMBER=$BUILD_NUMBER
+      - GOHOSTARCH=amd64
     buildArgs:
       - GOLANG_VERSION=`./scripts/get_golang_version.sh`
       - ARCH=amd64
@@ -22,6 +23,7 @@ agents:
       - NETWORK=$NETWORK
       - VERSION=$VERSION
       - BUILD_NUMBER=$BUILD_NUMBER
+      - GOHOSTARCH=amd64
     buildArgs:
       - GOLANG_VERSION=`./scripts/get_golang_version.sh`
       - ARCH=amd64
@@ -62,6 +64,7 @@ agents:
       - NETWORK=$NETWORK
       - VERSION=$VERSION
       - BUILD_NUMBER=$BUILD_NUMBER
+      - GOHOSTARCH=amd64
     buildArgs:
       - GOLANG_VERSION=`./scripts/get_golang_version.sh`
     volumes:
@@ -75,6 +78,7 @@ agents:
       - NETWORK=$NETWORK
       - VERSION=$VERSION
       - BUILD_NUMBER=$BUILD_NUMBER
+      - GOHOSTARCH=amd64
     buildArgs:
       - GOLANG_VERSION=`./scripts/get_golang_version.sh`
     volumes: