From 9900dae9ba05a623887bd6b79e86c5d9d2731022 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 31 Oct 2022 20:21:10 +0000 Subject: [PATCH 1/3] ansible: fix Jenkins icon download Download the Jenkins icon from our own CI server to avoid failure due to redirects. --- ansible/group_vars/release.yml | 1 + ansible/group_vars/test.yml | 1 + ansible/roles/jenkins-worker-windows/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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/jenkins-worker-windows/tasks/main.yml b/ansible/roles/jenkins-worker-windows/tasks/main.yml index fae778bb9..abfe9867e 100644 --- a/ansible/roles/jenkins-worker-windows/tasks/main.yml +++ b/ansible/roles/jenkins-worker-windows/tasks/main.yml @@ -9,7 +9,7 @@ - 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 From bd5258b77b812ef4393f2d7371287cfe05a3d12e Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 18 Nov 2022 13:20:27 +0000 Subject: [PATCH 2/3] ansible: update Windows workers to Java 17 Refs: https://github.com/nodejs/build/issues/3030 --- ansible/roles/jenkins-worker-windows/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/jenkins-worker-windows/tasks/main.yml b/ansible/roles/jenkins-worker-windows/tasks/main.yml index abfe9867e..42cd91f95 100644 --- a/ansible/roles/jenkins-worker-windows/tasks/main.yml +++ b/ansible/roles/jenkins-worker-windows/tasks/main.yml @@ -4,8 +4,8 @@ # 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: From 80334ef305c3fd8d19546299b47c1304f9f863e1 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 31 Oct 2022 16:31:32 +0000 Subject: [PATCH 3/3] ansible: pin Python 3 to 3.10.8 (#3062) Node.js 14 is incompatible with Python 3.11. Pin Python 3 to 3.10.8. --- ansible/roles/baselayout-windows/tasks/main.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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