fixup! ansible: change archtype in jenkins start script

nodejs · Mar 12, 2021 · 10b20b3 · 10b20b3
1 parent ada9f5c
commit 10b20b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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',