From 5a0f3f6b0afc0144d423858a61a9a2b548c4b9eb Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Fri, 11 Dec 2020 15:45:46 +0000 Subject: [PATCH 01/11] ansible: add support for apple sillicon --- ansible/inventory.yml | 6 ++- ansible/playbooks/jenkins/worker/create.yml | 54 +++++++++---------- ansible/plugins/inventory/nodejs_yaml.py | 2 +- ansible/roles/baselayout/tasks/main.yml | 24 ++++----- ansible/roles/jenkins-worker/vars/main.yml | 3 +- .../package-upgrade/tasks/partials/brew.yml | 11 +++- 6 files changed, 56 insertions(+), 44 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 0b8bffcd8..1ac273005 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -152,7 +152,11 @@ hosts: - macstadium: macos11.0-arm64-1: {ip: 199.7.163.9, user: administrator} - macos11.0-arm64-2: {ip: 199.7.163.10, user: administrator} + macos11.0-arm64-2: + ip: 199.7.163.10 + user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - marist: zos24-s390x-1: diff --git a/ansible/playbooks/jenkins/worker/create.yml b/ansible/playbooks/jenkins/worker/create.yml index 24302b455..a9aec1150 100644 --- a/ansible/playbooks/jenkins/worker/create.yml +++ b/ansible/playbooks/jenkins/worker/create.yml @@ -76,30 +76,30 @@ # Ensure node is not installed anywhere but the linter servers # -- hosts: - - test - - release - - "!test-packetnet-ubuntu1804-x64-1" - - "!test-packetnet-ubuntu1804-x64-2" - - "!test-ibm-ubuntu1804-x64-1" - tasks: - - name: remove node and npm packages - when: not os|startswith("win") and not os|startswith("zos") and not os|startswith("ibmi") - package: - name: "{{ package }}" - state: absent - loop_control: - loop_var: package - with_items: [ "node", "nodejs", "npm" ] - - name: fail if node is in the path - please uninstall it - when: not os|startswith("win") - shell: "node -v" - register: node_check_cmd - failed_when: node_check_cmd.rc == 0 - changed_when: False - - name: fail if node is in the path - please uninstall it - when: os|startswith("win") - win_shell: "node -v" - register: node_check_cmd_win - failed_when: node_check_cmd_win.rc == 0 - changed_when: False +# - hosts: +# - test +# - release +# - "!test-packetnet-ubuntu1804-x64-1" +# - "!test-packetnet-ubuntu1804-x64-2" +# - "!test-ibm-ubuntu1804-x64-1" +# tasks: +# - name: remove node and npm packages +# when: not os|startswith("win") and not os|startswith("zos") and not os|startswith("ibmi") +# package: +# name: "{{ package }}" +# state: absent +# loop_control: +# loop_var: package +# with_items: [ "node", "nodejs", "npm" ] +# - name: fail if node is in the path - please uninstall it +# when: not os|startswith("win") +# shell: "node -v" +# register: node_check_cmd +# failed_when: node_check_cmd.rc == 0 +# changed_when: False +# - name: fail if node is in the path - please uninstall it +# when: os|startswith("win") +# win_shell: "node -v" +# register: node_check_cmd_win +# failed_when: node_check_cmd_win.rc == 0 +# changed_when: False diff --git a/ansible/plugins/inventory/nodejs_yaml.py b/ansible/plugins/inventory/nodejs_yaml.py index 5c452dd8e..a3a1008b2 100755 --- a/ansible/plugins/inventory/nodejs_yaml.py +++ b/ansible/plugins/inventory/nodejs_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright Node.js contributors. All rights reserved. diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml index 272d128d5..35f2ad9f9 100644 --- a/ansible/roles/baselayout/tasks/main.yml +++ b/ansible/roles/baselayout/tasks/main.yml @@ -83,18 +83,18 @@ - "{{ common_packages|default('[]') }}" # Currently does not work on the DTK for 11.0 - The unsupported warnings cause the task to fail -- name: install packages (macos) - when: os|startswith("macos") - become_user: administrator - package: name="{{ package }}" state=present - loop_control: - loop_var: package - with_items: - # ansible doesn't like empty lists - - "{{ packages[os+'_'+arch]|default('[]') }}" - - "{{ packages[os]|default('[]') }}" - - "{{ packages[os|stripversion]|default('[]') }}" - - "{{ common_packages|default('[]') }}" +# - name: install packages (macos) +# when: os|startswith("macos") +# become_user: administrator +# package: name="{{ package }}" state=present +# loop_control: +# loop_var: package +# with_items: +# # ansible doesn't like empty lists +# - "{{ packages[os+'_'+arch]|default('[]') }}" +# - "{{ packages[os]|default('[]') }}" +# - "{{ packages[os|stripversion]|default('[]') }}" +# - "{{ common_packages|default('[]') }}" - name: centos7_ppc64 | update package alternatives when: os == "centos7" and arch == "ppc64" diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index 4d5ed8413..7e66a0bde 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -97,7 +97,8 @@ java_path: { 'macos10.14': 'java', 'macos10.15': 'java', 'macos10.16': 'java', - 'macos11.0': 'java', + # Currently hardcoded untill adopt have their build available + 'macos11.0': '/Users/administrator/zulu8.50.0.1017-ca-jdk8.0.275-macos_aarch64/bin/java', 'smartos15': '/opt/local/java/openjdk8/bin/java', 'smartos16': '/opt/local/java/openjdk8/bin/java', 'smartos17': '/opt/local/java/openjdk8/bin/java', diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index 951d998b5..f586eba2b 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -13,15 +13,22 @@ script: files/install-xcode.sh when: xcode.rc > 1 + - name: Check if Homebrew is already installed (Apple Sillicon) + stat: + path: /opt/homebrew/bin/brew + register: brew + when: os == "macos11.0" + - name: Check if Homebrew is already installed stat: path: /usr/local/bin/brew - register: brew + register: armbrew + when: os != "macos11.0" - name: Install Homebrew become_user: administrator script: files/install-homebrew.sh - when: not brew.stat.exists + when: not brew.stat.exists and os != "macos11.0" - name: Upgrade installed packages become_user: administrator From 88aa724d228ac8a907ee05a5f05feb5a81136766 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Wed, 10 Mar 2021 12:26:33 +0000 Subject: [PATCH 02/11] ansible: add M1 Macs Also clean up some out of date machines --- ansible/inventory.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 1ac273005..3701e1022 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -50,8 +50,9 @@ hosts: ubuntu1804_docker-x64-1: {ip: 165.225.150.76, user: ubuntu} - macstadium: - macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator} - macos10.10-x64-1: {ip: 207.254.58.162, port: 10014, user: administrator} + macos11.0-arm64-1: + ip: 207.254.38.74 + user: administrator - marist: zos24-s390x-1: {ip: 148.100.36.157, user: unix1} @@ -157,6 +158,12 @@ hosts: user: administrator remote_env: PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + macos11.0-arm64-3: + ip: 207.254.38.86 + user: administrator + macos11.0-arm64-4: + ip: 207.254.38.89 + user: administrator - marist: zos24-s390x-1: From 9b673fcdf89a379dc7a269e9823dddb58188fba8 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Thu, 11 Mar 2021 11:22:00 +0000 Subject: [PATCH 03/11] ansible: Add new m1 macs --- ansible/inventory.yml | 9 +++++++++ ansible/roles/java-base/tasks/main.yml | 18 +++++++++++++++--- ansible/roles/java-base/vars/main.yml | 4 ++-- .../package-upgrade/tasks/partials/brew.yml | 4 ++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 3701e1022..9639be432 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -51,8 +51,11 @@ hosts: - macstadium: macos11.0-arm64-1: + ansible_python_interpreter: /usr/bin/python3 ip: 207.254.38.74 user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - marist: zos24-s390x-1: {ip: 148.100.36.157, user: unix1} @@ -159,11 +162,17 @@ hosts: remote_env: PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin macos11.0-arm64-3: + ansible_python_interpreter: /usr/bin/python3 ip: 207.254.38.86 user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin macos11.0-arm64-4: + ansible_python_interpreter: /usr/bin/python3 ip: 207.254.38.89 user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - marist: zos24-s390x-1: diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml index 7ab969d6a..30208ab97 100644 --- a/ansible/roles/java-base/tasks/main.yml +++ b/ansible/roles/java-base/tasks/main.yml @@ -53,18 +53,30 @@ - name: install java tap (macOS) become_user: administrator - when: java.rc > 0 and os|startswith("macos") + when: java.rc > 0 and os|startswith("macos10") homebrew_tap: name: AdoptOpenJDK/openjdk state: present - name: install java (macOS) become_user: administrator - when: java.rc > 0 and os|startswith("macos") + when: java.rc > 0 and os|startswith("macos10") homebrew_cask: name: "{{ java_package_name }}" state: present +- name: Fetch java (Apple Silicon) + when: os|startswith("macos11") + shell: + chdir: "/Users/administrator" + cmd: "curl -L -o zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz https://cdn.azul.com/zulu/bin/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz" + +- name: Extract java (Apple Silicon) + when: os|startswith("macos11") + shell: + chdir: "/Users/administrator" + cmd: "tar -xf zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz" + - name: install webupd8 oracle java 8 extras when: java.rc > 0 and os == "ubuntu1404" and arch != "ppc64" package: name="{{item}}" state=present @@ -151,4 +163,4 @@ - use_adoptopenjdk == True - update_adoptopenjdk == True - adoptopenjdk_symlink.stat.exists - - adoptopenjdk_symlink.stat.lnk_source != "/opt/"+adoptopenjdk_unpacked.files[0].split('/')[0]+"/bin/java" \ No newline at end of file + - adoptopenjdk_symlink.stat.lnk_source != "/opt/"+adoptopenjdk_unpacked.files[0].split('/')[0]+"/bin/java" diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 2011d87cf..9b00f64f3 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -13,7 +13,7 @@ packages: { 'fedora': 'java-1.8.0-openjdk-headless', 'freebsd': 'openjdk8-jre', 'ibmi': 'openjdk-11-ea', - 'macos': 'adoptopenjdk8', + 'macos10': 'adoptopenjdk8', 'rhel7': 'java-1.8.0-openjdk', 'smartos': 'openjdk8', 'ubuntu': 'openjdk-8-jre-headless', @@ -36,4 +36,4 @@ adoptopenjdk: { adoptopenjdk_arch: "{{ adoptopenjdk[os+'_'+arch].arch | default(ansible_architecture) }}" adoptopenjdk_os: "{{ adoptopenjdk[os+'_'+arch].os | default(ansible_system | lower) }}" adoptopenjdk_version: "{{ adoptopenjdk[os+'_'+arch].version | default('8') }}" -use_adoptopenjdk: "{{ adoptopenjdk[os+'_'+arch] is defined | bool }}" \ No newline at end of file +use_adoptopenjdk: "{{ adoptopenjdk[os+'_'+arch] is defined | bool }}" diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index f586eba2b..ac3367f33 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -22,13 +22,13 @@ - name: Check if Homebrew is already installed stat: path: /usr/local/bin/brew - register: armbrew + register: brew when: os != "macos11.0" - name: Install Homebrew become_user: administrator script: files/install-homebrew.sh - when: not brew.stat.exists and os != "macos11.0" + when: not brew.stat.exists - name: Upgrade installed packages become_user: administrator From f334baf743f3bd47a808727cc59db90edd6695f0 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Thu, 11 Mar 2021 11:45:33 +0000 Subject: [PATCH 04/11] clean up inventory file --- ansible/inventory.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 9639be432..104d20d83 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -155,7 +155,11 @@ hosts: ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu} - macstadium: - macos11.0-arm64-1: {ip: 199.7.163.9, user: administrator} + macos11.0-arm64-1: + ip: 199.7.163.9 + user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin macos11.0-arm64-2: ip: 199.7.163.10 user: administrator @@ -205,14 +209,6 @@ hosts: ubuntu1604-arm64_odroid_c2-2: {ip: 70.167.220.148} ubuntu1604-arm64_odroid_c2-3: {ip: 70.167.220.149, user: odroid} - - macstadium: - macos10.10-x64-1: {ip: 207.254.58.162, port: 10005, user: administrator} - macos10.10-x64-2: {ip: 207.254.58.162, port: 10006, user: administrator} - macos10.11-x64-1: {ip: 207.254.58.162, port: 10003, user: administrator} - macos10.11-x64-2: {ip: 207.254.58.162, port: 10004, user: administrator} - macos10.12-x64-1: {ip: 207.254.58.162, port: 10001, user: administrator} - macos10.12-x64-2: {ip: 207.254.58.162, port: 10002, user: administrator} - - msft: win10_vs2017-arm64-1: {} win10_vs2017-arm64-2: {} From 310dc92920397399b6c2e17693cb1b03e1b31a54 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Thu, 11 Mar 2021 16:07:23 +0000 Subject: [PATCH 05/11] update broken steps --- ansible/playbooks/jenkins/worker/create.yml | 54 +++++++++---------- ansible/roles/baselayout/tasks/main.yml | 24 ++++----- ansible/roles/jenkins-worker/vars/main.yml | 2 +- .../package-upgrade/tasks/partials/brew.yml | 9 +++- 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/ansible/playbooks/jenkins/worker/create.yml b/ansible/playbooks/jenkins/worker/create.yml index a9aec1150..207aec7ab 100644 --- a/ansible/playbooks/jenkins/worker/create.yml +++ b/ansible/playbooks/jenkins/worker/create.yml @@ -76,30 +76,30 @@ # Ensure node is not installed anywhere but the linter servers # -# - hosts: -# - test -# - release -# - "!test-packetnet-ubuntu1804-x64-1" -# - "!test-packetnet-ubuntu1804-x64-2" -# - "!test-ibm-ubuntu1804-x64-1" -# tasks: -# - name: remove node and npm packages -# when: not os|startswith("win") and not os|startswith("zos") and not os|startswith("ibmi") -# package: -# name: "{{ package }}" -# state: absent -# loop_control: -# loop_var: package -# with_items: [ "node", "nodejs", "npm" ] -# - name: fail if node is in the path - please uninstall it -# when: not os|startswith("win") -# shell: "node -v" -# register: node_check_cmd -# failed_when: node_check_cmd.rc == 0 -# changed_when: False -# - name: fail if node is in the path - please uninstall it -# when: os|startswith("win") -# win_shell: "node -v" -# register: node_check_cmd_win -# failed_when: node_check_cmd_win.rc == 0 -# changed_when: False +- hosts: + - test + - release + - "!test-packetnet-ubuntu1804-x64-1" + - "!test-packetnet-ubuntu1804-x64-2" + - "!test-ibm-ubuntu1804-x64-1" + tasks: + - name: remove node and npm packages + when: not os|startswith("win") and not os|startswith("zos") and not os|startswith("ibmi") and os != "macos11.0" + package: + name: "{{ package }}" + state: absent + loop_control: + loop_var: package + with_items: [ "node", "nodejs", "npm" ] + - name: fail if node is in the path - please uninstall it + when: not os|startswith("win") + shell: "node -v" + register: node_check_cmd + failed_when: node_check_cmd.rc == 0 + changed_when: False + - name: fail if node is in the path - please uninstall it + when: os|startswith("win") + win_shell: "node -v" + register: node_check_cmd_win + failed_when: node_check_cmd_win.rc == 0 + changed_when: False diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml index 35f2ad9f9..5c2aaad40 100644 --- a/ansible/roles/baselayout/tasks/main.yml +++ b/ansible/roles/baselayout/tasks/main.yml @@ -83,18 +83,18 @@ - "{{ common_packages|default('[]') }}" # Currently does not work on the DTK for 11.0 - The unsupported warnings cause the task to fail -# - name: install packages (macos) -# when: os|startswith("macos") -# become_user: administrator -# package: name="{{ package }}" state=present -# loop_control: -# loop_var: package -# with_items: -# # ansible doesn't like empty lists -# - "{{ packages[os+'_'+arch]|default('[]') }}" -# - "{{ packages[os]|default('[]') }}" -# - "{{ packages[os|stripversion]|default('[]') }}" -# - "{{ common_packages|default('[]') }}" +- name: install packages (macos) + when: os|startswith("macos") + become_user: administrator + community.general.homebrew: name="{{ package }}" state=present + loop_control: + loop_var: package + with_items: + # ansible doesn't like empty lists + - "{{ packages[os+'_'+arch]|default('[]') }}" + - "{{ packages[os]|default('[]') }}" + - "{{ packages[os|stripversion]|default('[]') }}" + - "{{ common_packages|default('[]') }}" - name: centos7_ppc64 | update package alternatives when: os == "centos7" and arch == "ppc64" diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index 7e66a0bde..17b1626e5 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -98,7 +98,7 @@ java_path: { 'macos10.15': 'java', 'macos10.16': 'java', # Currently hardcoded untill adopt have their build available - 'macos11.0': '/Users/administrator/zulu8.50.0.1017-ca-jdk8.0.275-macos_aarch64/bin/java', + 'macos11.0': '/Users/administrator/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64/bin/java', 'smartos15': '/opt/local/java/openjdk8/bin/java', 'smartos16': '/opt/local/java/openjdk8/bin/java', 'smartos17': '/opt/local/java/openjdk8/bin/java', diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index ac3367f33..33399a3c1 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -16,7 +16,7 @@ - name: Check if Homebrew is already installed (Apple Sillicon) stat: path: /opt/homebrew/bin/brew - register: brew + register: armbrew when: os == "macos11.0" - name: Check if Homebrew is already installed @@ -28,7 +28,12 @@ - name: Install Homebrew become_user: administrator script: files/install-homebrew.sh - when: not brew.stat.exists + when: os != "macos11.0" and not brew.stat.exists + + - name: Install Homebrew + become_user: administrator + script: files/install-homebrew.sh + when: os == "macos11.0" and not armbrew.stat.exists - name: Upgrade installed packages become_user: administrator From 9ca3c274147ad4b8922afd70ce347c09942857dd Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Thu, 11 Mar 2021 16:11:53 +0000 Subject: [PATCH 06/11] fixup! update broken steps --- ansible/plugins/inventory/nodejs_yaml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/plugins/inventory/nodejs_yaml.py b/ansible/plugins/inventory/nodejs_yaml.py index a3a1008b2..5c452dd8e 100755 --- a/ansible/plugins/inventory/nodejs_yaml.py +++ b/ansible/plugins/inventory/nodejs_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright Node.js contributors. All rights reserved. From 59028ec05f94c25ab3e1cf533e938cee7399d64a Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Thu, 11 Mar 2021 17:24:55 +0000 Subject: [PATCH 07/11] 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, 6 insertions(+), 2 deletions(-) diff --git a/ansible/roles/jenkins-worker/templates/start.j2 b/ansible/roles/jenkins-worker/templates/start.j2 index 57338345a..9b1420fa1 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=x64 -export DESTCPU=x64 +export ARCH="{{ archtype[os] }}" +export DESTCPU="{{ archtype[os] }}" 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 17b1626e5..1f650b058 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -87,6 +87,10 @@ 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', From ddb4e27add05fd1c16fddcab02918cd56daef3f1 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Fri, 12 Mar 2021 10:17:01 +0000 Subject: [PATCH 08/11] 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 1f650b058..17b1626e5 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', From 20bf1390af58cc9956c28c0762d0de79425eabf6 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Wed, 24 Mar 2021 14:49:10 +0000 Subject: [PATCH 09/11] add missing slash --- ansible/roles/baselayout/tasks/partials/ccache/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/baselayout/tasks/partials/ccache/macos.yml b/ansible/roles/baselayout/tasks/partials/ccache/macos.yml index f6c9377f3..02f535963 100644 --- a/ansible/roles/baselayout/tasks/partials/ccache/macos.yml +++ b/ansible/roles/baselayout/tasks/partials/ccache/macos.yml @@ -8,6 +8,6 @@ - name: "ccache : add ccache to the path (macos)" when: ccache_mac.rc == 1 lineinfile: - dest: "etc/paths" + dest: "/etc/paths" insertbefore: BOF line: "usr/local/opt/ccache/libexec" From e0a9f57cf55c817f5cf30454e3b432d25bdf2212 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Wed, 24 Mar 2021 16:04:21 +0000 Subject: [PATCH 10/11] fixup some script errors --- ansible/inventory.yml | 1 + ansible/roles/baselayout/tasks/partials/ccache/macos.yml | 2 +- ansible/roles/jenkins-worker/templates/start.j2 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 104d20d83..60f31475c 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -56,6 +56,7 @@ hosts: user: administrator remote_env: PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + server_jobs: 6 - marist: zos24-s390x-1: {ip: 148.100.36.157, user: unix1} diff --git a/ansible/roles/baselayout/tasks/partials/ccache/macos.yml b/ansible/roles/baselayout/tasks/partials/ccache/macos.yml index 02f535963..0eba4e588 100644 --- a/ansible/roles/baselayout/tasks/partials/ccache/macos.yml +++ b/ansible/roles/baselayout/tasks/partials/ccache/macos.yml @@ -10,4 +10,4 @@ lineinfile: dest: "/etc/paths" insertbefore: BOF - line: "usr/local/opt/ccache/libexec" + line: "/usr/local/opt/ccache/libexec" diff --git a/ansible/roles/jenkins-worker/templates/start.j2 b/ansible/roles/jenkins-worker/templates/start.j2 index 31711a2bc..9bccbac8f 100644 --- a/ansible/roles/jenkins-worker/templates/start.j2 +++ b/ansible/roles/jenkins-worker/templates/start.j2 @@ -7,6 +7,6 @@ export OSTYPE=osx 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') }} \ +PATH="/usr/local/opt/ccache/libexec:/usr/local/opt/python3/Frameworks/Python.framework/Versions/Current/bin:/opt/homebrew/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 }} \ -jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/slave-agent.jnlp From 2acd61c6dbba0fcabcb06acd9a068c34ef489a56 Mon Sep 17 00:00:00 2001 From: Ash Cripps Date: Tue, 6 Apr 2021 10:52:03 +0100 Subject: [PATCH 11/11] ansible: remove DTKs --- ansible/inventory.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 60f31475c..19b20b9d8 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -156,16 +156,6 @@ hosts: ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu} - macstadium: - macos11.0-arm64-1: - ip: 199.7.163.9 - user: administrator - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - macos11.0-arm64-2: - ip: 199.7.163.10 - user: administrator - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin macos11.0-arm64-3: ansible_python_interpreter: /usr/bin/python3 ip: 207.254.38.86