From 10b20b3597727ce7900500a39638cd2afa6887dd Mon Sep 17 00:00:00 2001
From: Ash Cripps <acripps@redhat.com>
Date: Fri, 12 Mar 2021 10:17:01 +0000
Subject: [PATCH] fixup! ansible: change archtype in jenkins start script

---
 ansible/roles/jenkins-worker/templates/start.j2 | 4 ++--
 ansible/roles/jenkins-worker/vars/main.yml      | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/jenkins-worker/templates/start.j2 b/ansible/roles/jenkins-worker/templates/start.j2
index 9b1420fa1..31711a2bc 100644
--- a/ansible/roles/jenkins-worker/templates/start.j2
+++ b/ansible/roles/jenkins-worker/templates/start.j2
@@ -4,8 +4,8 @@ export NODE_TEST_DIR="$HOME/tmp"
 export JOBS="{{ jobs_env }}"
 
 export OSTYPE=osx
-export ARCH="{{ archtype[os] }}"
-export DESTCPU="{{ archtype[os] }}"
+export ARCH="{{ arch }}"
+export DESTCPU="{{ arch }}"
 
 PATH="/usr/local/opt/ccache/libexec:/usr/local/opt/python3/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" {{ java_path[os] }} -Xmx{{ server_ram|default('128m') }} \
     -jar {{ home }}/{{ server_user }}/slave.jar -secret {{ secret }} \
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
index 5d92d6bdc..abd7d0d12 100644
--- a/ansible/roles/jenkins-worker/vars/main.yml
+++ b/ansible/roles/jenkins-worker/vars/main.yml
@@ -87,10 +87,6 @@ needs_monit: [
   'debian7',
   ]
 
-archtype: {
-  macos11.0: 'arm64'
-}
-
 # some os'es needs different paths to java. add them here.
 java_path: {
   'ibmi72': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',