diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index 9391f532b..7a99634dd 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -54,3 +54,4 @@ ansible_winrm_server_cert_validation = ignore [hosts:macos] home = /Users +ansible_python_interpreter = /usr/bin/python3 diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 0f54204d3..a92e8856c 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -138,6 +138,10 @@ hosts: ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu} 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-2: {ip: 199.7.163.10, user: administrator} + - marist: zos13-s390x-1: ip: 148.100.36.133 diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml index 07d0658c6..9e534b430 100644 --- a/ansible/roles/baselayout/tasks/main.yml +++ b/ansible/roles/baselayout/tasks/main.yml @@ -87,6 +87,7 @@ - "{{ packages[os|stripversion]|default('[]') }}" - "{{ 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 diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index bf1f85564..0afc8b54b 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -111,6 +111,14 @@ packages: { 'cmake,python,ccache' ], + 'macos10.16': [ + 'cmake,python,ccache' + ], + + 'macos11.0': [ + 'cmake,python,ccache' + ], + rhel7: [ 'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel', ], diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml index ff676aece..794194a86 100644 --- a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml +++ b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml @@ -8,4 +8,4 @@ pip: name: tap2junit state: present - executable: /usr/local/bin/pip3 + executable: /usr/bin/pip3 diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index e71fbe820..8b9a5880f 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -96,6 +96,8 @@ java_path: { 'macos10.13': 'java', 'macos10.14': 'java', 'macos10.15': 'java', + 'macos10.16': 'java', + 'macos11.0': '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/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 786438be1..de9121619 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -108,6 +108,7 @@ def buildExclusions = [ [ /^osx1010(?!-release-sources)/, releaseType, allVer ], [ /^osx1011/, testType, gte(14) ], [ /^osx1011/, releaseType, allVer ], + [ /^osx11/, testType, lt(15) ], // osx1015 enabled for all, and builds all releases to support notarization // FreeBSD -----------------------------------------------