diff --git a/ansible/group_vars/release.yml b/ansible/group_vars/release.yml index 5592dbcd2..1c9b53a2d 100644 --- a/ansible/group_vars/release.yml +++ b/ansible/group_vars/release.yml @@ -1,6 +1,7 @@ jenkins_url: "https://ci-release.nodejs.org" # intentionally fetching `slave.jar` from ci.nodejs.org to avoid auth problems jenkins_worker_jar: "https://ci.nodejs.org/jnlpJars/slave.jar" +jenkins_icon: "https://ci.nodejs.org/favicon.ico" server_user: "iojs" home: "/home" git_reference_path: "{{ home }}/{{ server_user }}/.ccache/node.shared.reference" diff --git a/ansible/group_vars/test.yml b/ansible/group_vars/test.yml index 3165d07be..ddd0dadfb 100644 --- a/ansible/group_vars/test.yml +++ b/ansible/group_vars/test.yml @@ -1,5 +1,6 @@ jenkins_url: "https://ci.nodejs.org" jenkins_worker_jar: "{{ jenkins_url }}/jnlpJars/slave.jar" +jenkins_icon: "{{ jenkins_url }}/favicon.ico" server_user: iojs home: "/home" git_reference_path: "{{ home }}/{{ server_user }}/git/io.js.reference" diff --git a/ansible/roles/baselayout-windows/tasks/main.yml b/ansible/roles/baselayout-windows/tasks/main.yml index 75dac30e1..15a9e8107 100644 --- a/ansible/roles/baselayout-windows/tasks/main.yml +++ b/ansible/roles/baselayout-windows/tasks/main.yml @@ -13,7 +13,18 @@ install_args: 'ADD_CMAKE_TO_PATH=System' - name: install Python 3 - win_chocolatey: name=python + win_chocolatey: + install_args: Include_launcher=1 + name: python3 + pinned: yes + version: "3.10.8" + +- name: install Python 3 + win_chocolatey: + install_args: Include_launcher=1 + name: python + pinned: yes + version: "3.10.8" - name: install Python 2 win_chocolatey: name=python2 diff --git a/ansible/roles/jenkins-worker-windows/tasks/main.yml b/ansible/roles/jenkins-worker-windows/tasks/main.yml index fae778bb9..42cd91f95 100644 --- a/ansible/roles/jenkins-worker-windows/tasks/main.yml +++ b/ansible/roles/jenkins-worker-windows/tasks/main.yml @@ -4,12 +4,12 @@ # Install the Jenkins worker # -- name: install Java 8 - win_chocolatey: name=jdk8 +- name: install Java 17 + win_chocolatey: name=Temurin17 - name: download Jenkins icon win_get_url: - url: 'http://mirrors.jenkins-ci.org/art/jenkins-logo/favicon.ico' + url: '{{ jenkins_icon }}' dest: 'C:\jenkins.ico' force: no