Windows Updates #2099

joaocgreis · 2019-12-18T03:15:39Z

This is all already in use by CI, but not yet by the release Jenkins. The release job need to be adjusted while landing this.

Notable changes:

VS2019 support
Windows now uses the VersionSelectorScript - it is a bit complex as expected, but it manages to filter for building node, building add-ons, and choose what runs where depending on what labels are available while always avoiding invalid combinations
Moved most scripts from CI jobs to the build repo - this allows us to reuse parts of the scripts for different jobs, gives us some history for long-term changes, and it is easy to change to a fork for testing if needed
Test building in debug mode
Test building the MSI
Python 3 added to all Windows machines
(EDIT) CMake added to all Windows machines
Windows moved to the main create worker playbook
Some documentation updates

Re-created all Windows machines to balance available versions optimizing for current master.

Refs: #1996

richardlau · 2019-12-18T03:26:46Z

doc/windows-visualstudio-supported-versions.md

@@ -34,6 +37,9 @@ Supported versions for building Node.js from source.
 | v9              | 2015, VCBT2015, 2017                |
 | v10             | 2017 <sup>[5]</sup>                 |
 | v11             | 2017                                |
+| v12             | 2017, 2019 (flag) <sup>[8]</sup>    |
+| v13             | 2017, 2019 <sup>[9]</sup>           |
+| v13             | 2017, 2019                          |


Is this line supposed to be v14?

Yes, fixed, thanks!

Following Azure security recommendations.

Specific commit and floating PRs known to work.

Refs: nodejs#2097

joaocgreis · 2019-12-19T17:06:22Z

Added a commit to install CMake (#2097) and rebased.

richardlau · 2019-12-19T17:15:33Z

Added a commit to install CMake (#2097) and rebased.

It's not part of the Native Desktop Workload for Visual Studio? We have https://ci.nodejs.org/job/libuv-test-commit-windows-cmake/ already running in the CI.

joaocgreis · 2019-12-19T17:30:40Z

As I understand it, using CMake from VS is a bit of an hack. Needs to be accessed by full path, so location will change with VS version. Also, it's not present in VS2015. Having it from Chocolatey should be a better option, more so if we start using it to build Node at some point.

ansible/roles/baselayout-windows/tasks/main.yml

doc/node-test-commit-matrix.md

rvagg · 2019-12-20T01:11:48Z

jenkins/scripts/ci-node-version.sh

+
+# Retry once
+git archive --format=tar --remote="$TEMP_REPO" $TEMP_BRANCH src/node_version.h -o node_version.h.tar ||
+git archive --format=tar --remote="$TEMP_REPO" $TEMP_BRANCH src/node_version.h -o node_version.h.tar


this is interesting, fetching a single file from a remote repo? I get protocol problems trying this out locally so can't seem to replicate this behaviour.

I also had issues with http repos, but this works for our temp repo (ssh). This is already being used by node-test-commit-windows-fanned (running in jenkins-workspace).

rvagg · 2019-12-20T01:12:40Z

jenkins/scripts/VersionSelectorScript.groovy

+  [ /vs2019-x86$/,                    testType,    lt(14)        ],
+  // VS versions supported to build add-ons
+  [ /vs2013-COMPILED_BY/,             testType,    gte(9)        ],
+  [ /vs2015-COMPILED_BY/,             testType,    noVer         ],


👍 good idea to include these with noVer for completeness and documentation purposes, I like

rvagg

hard to grok too much of this without better knowledge of windows & ansible+windows and a bunch of other stuff in here so this is mostly a rubber-stamp. Some comments inline, nothing major blocking, except maybe the pip2 vs pip3.

cclauss

Very impressive work! Thanks much!

ansible/roles/baselayout-windows/tasks/main.yml

cclauss · 2019-12-20T06:20:17Z

ansible/roles/visual-studio/tasks/main.yml

-  # TODO: Ensure no other versions are installed
-  - name: install Visual Studio 2013
-    include_tasks: "partials/vs2013.yml"
+- name: install Visual Studio 2013


Do we still want to test and support 2013? https://docs.microsoft.com/en-us/visualstudio/releases/2019/servicing#support-for-older-versions-of-visual-studio

VS2013 is used to test add-ons for Node.js v8. We should keep the machines available for some time after a Node version goes EOL, but anyway I'd like this to be in the commit history for documentation (we might need to test an old issue or something).

ansible/roles/visual-studio/tasks/partials/vs2019.yml

joaocgreis · 2019-12-29T03:18:36Z

Thanks for the reviews! This needs some work to land, iojs+release needs to have the same changes as the test release job, and the jobs in CI need to be changed to point at master. I'll do it later this week.

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

Following Azure security recommendations. PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

Specific commit and floating PRs known to work. PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

Refs: #2097 PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis · 2020-01-02T16:10:16Z

Thanks!

Adapted the jobs on both Jenkins instances.

Landed in 1dd97fa...36202a2

joaocgreis mentioned this pull request Dec 18, 2019

Optimize test scripts for CI job for windows #805

Closed

richardlau reviewed Dec 18, 2019

View reviewed changes

joaocgreis added 15 commits December 19, 2019 17:02

jenkins: add Windows to VersionSelectorScript

cddccff

jenkins: add Windows scripts

bada110

ansible,win: disable SSLv2 and SSLv3

ef7aba9

Following Azure security recommendations.

ansible,win: don't install MFC and XP compat

ec5b0c9

ansible,win: add VS2019 support

2a75671

ansible,win: add clcache

85aad05

Specific commit and floating PRs known to work.

ansible,win: add Python 3

cb15133

ansible,win: add CMake

de34516

Refs: nodejs#2097

ansible,win: add update-windows playbook

8659b6f

ansible: accept 'password' shortcut

ed98d5c

ansible: move Windows to main create worker playbook

ff0c567

ansible: update Windows inventory

6f1a8f1

doc,win: update non-ansible-configuration-notes.md

a9da63f

doc,win: update Windows supported versions

7144fc5

doc,win: update node-test-commit-matrix.md

88c5ec6

joaocgreis force-pushed the joaocgreis-JBC-windows-updates branch from e8669b1 to 88c5ec6 Compare December 19, 2019 17:05

joaocgreis mentioned this pull request Dec 19, 2019

cmake on CITGM infrastructure #2097

Closed

rvagg reviewed Dec 20, 2019

View reviewed changes

ansible/roles/baselayout-windows/tasks/main.yml Show resolved Hide resolved

rvagg reviewed Dec 20, 2019

View reviewed changes

doc/node-test-commit-matrix.md Outdated Show resolved Hide resolved

rvagg reviewed Dec 20, 2019

View reviewed changes

doc/node-test-commit-matrix.md Outdated Show resolved Hide resolved

rvagg reviewed Dec 20, 2019

View reviewed changes

rvagg approved these changes Dec 20, 2019

View reviewed changes

fixup! doc,win: update node-test-commit-matrix.md

a5edf24

richardlau approved these changes Dec 20, 2019

View reviewed changes

cclauss approved these changes Dec 20, 2019

View reviewed changes

fixup! ansible,win: add VS2019 support

a88ba93

joaocgreis added a commit that referenced this pull request Jan 2, 2020

jenkins: add Windows to VersionSelectorScript

31c0cbc

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

jenkins: add Windows scripts

360cd75

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible,win: don't install MFC and XP compat

5967f58

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible,win: add VS2019 support

ea9a139

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible,win: add Python 3

7c3aa84

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible,win: add CMake

5e270be

Refs: #2097 PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible,win: add update-windows playbook

4b5c48f

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible: accept 'password' shortcut

c85f5ca

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible: move Windows to main create worker playbook

20ae609

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

ansible: update Windows inventory

76e1f0b

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

doc,win: update non-ansible-configuration-notes.md

ec6030f

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

doc,win: update Windows supported versions

3777835

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis added a commit that referenced this pull request Jan 2, 2020

doc,win: update node-test-commit-matrix.md

36202a2

PR-URL: #2099 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com>

joaocgreis closed this Jan 2, 2020

richardlau mentioned this pull request Feb 4, 2020

Unable to build nodejs in VS2017 or VS2019 nodejs/node#31626

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Windows Updates #2099

Windows Updates #2099

joaocgreis commented Dec 18, 2019 •

edited

Loading

richardlau Dec 18, 2019

joaocgreis Dec 18, 2019

joaocgreis commented Dec 19, 2019

richardlau commented Dec 19, 2019

joaocgreis commented Dec 19, 2019

rvagg Dec 20, 2019

joaocgreis Dec 20, 2019

rvagg Dec 20, 2019

rvagg left a comment

cclauss left a comment

cclauss Dec 20, 2019

joaocgreis Dec 29, 2019

joaocgreis commented Dec 29, 2019

joaocgreis commented Jan 2, 2020

Windows Updates #2099

Windows Updates #2099

Conversation

joaocgreis commented Dec 18, 2019 • edited Loading

richardlau Dec 18, 2019

Choose a reason for hiding this comment

joaocgreis Dec 18, 2019

Choose a reason for hiding this comment

joaocgreis commented Dec 19, 2019

richardlau commented Dec 19, 2019

joaocgreis commented Dec 19, 2019

rvagg Dec 20, 2019

Choose a reason for hiding this comment

joaocgreis Dec 20, 2019

Choose a reason for hiding this comment

rvagg Dec 20, 2019

Choose a reason for hiding this comment

rvagg left a comment

Choose a reason for hiding this comment

cclauss left a comment

Choose a reason for hiding this comment

cclauss Dec 20, 2019

Choose a reason for hiding this comment

joaocgreis Dec 29, 2019

Choose a reason for hiding this comment

joaocgreis commented Dec 29, 2019

joaocgreis commented Jan 2, 2020

joaocgreis commented Dec 18, 2019 •

edited

Loading