Skip to content

Commit ddb4e27

Browse files
author
Ash Cripps
committed
fixup! ansible: change archtype in jenkins start script
1 parent 59028ec commit ddb4e27

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ansible/roles/jenkins-worker/templates/start.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export NODE_TEST_DIR="$HOME/tmp"
44
export JOBS="{{ jobs_env }}"
55

66
export OSTYPE=osx
7-
export ARCH="{{ archtype[os] }}"
8-
export DESTCPU="{{ archtype[os] }}"
7+
export ARCH="{{ arch }}"
8+
export DESTCPU="{{ arch }}"
99

1010
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') }} \
1111
-jar {{ home }}/{{ server_user }}/slave.jar -secret {{ secret }} \

ansible/roles/jenkins-worker/vars/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ needs_monit: [
8787
'debian7',
8888
]
8989

90-
archtype: {
91-
macos11.0: 'arm64'
92-
}
93-
9490
# some os'es needs different paths to java. add them here.
9591
java_path: {
9692
'ibmi72': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',

0 commit comments

Comments
 (0)