From ef0bd35b37f1422546672546acb3d3f5cda8d56b Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:09:22 +0000 Subject: [PATCH 1/7] update platform matrix for node 14 deprecation --- eng/pipelines/templates/stages/platform-matrix.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 2ec6cc6a01ae..45c035c51a15 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -18,7 +18,6 @@ } }, "NodeTestVersion": [ - "14.x", "16.x", "18.x", "20.x" @@ -49,7 +48,7 @@ "TestResultsFiles": "**/test-results.browser.xml" } }, - "NodeTestVersion": "14.x" + "NodeTestVersion": "18.x" }, { "Agent": { @@ -59,7 +58,7 @@ } }, "TestType": "node", - "NodeTestVersion": "14.x", + "NodeTestVersion": "18.x", "DependencyVersion": [ "max", "min" From e9d48af0b77dad399c1385da37eb5be57828016d Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:27:03 +0000 Subject: [PATCH 2/7] update keyvault --- sdk/keyvault/keyvault-admin/platform-matrix.json | 7 ++++--- sdk/keyvault/keyvault-keys/platform-matrix.json | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk/keyvault/keyvault-admin/platform-matrix.json b/sdk/keyvault/keyvault-admin/platform-matrix.json index ee279322663b..86349f185e04 100644 --- a/sdk/keyvault/keyvault-admin/platform-matrix.json +++ b/sdk/keyvault/keyvault-admin/platform-matrix.json @@ -9,12 +9,13 @@ } }, "Versions": { - "14.x": { - "NodeTestVersion": "14.x" - }, + "16.x_service_version_7_2": { "NodeTestVersion": "16.x", "ServiceVersion": "7.2" + }, + "18.x": { + "NodeTestVersion": "18.x" } }, "TestType": "node" diff --git a/sdk/keyvault/keyvault-keys/platform-matrix.json b/sdk/keyvault/keyvault-keys/platform-matrix.json index c90f4800b7d9..c24868cafd88 100644 --- a/sdk/keyvault/keyvault-keys/platform-matrix.json +++ b/sdk/keyvault/keyvault-keys/platform-matrix.json @@ -9,7 +9,7 @@ } }, "TestType": "node", - "NodeTestVersion": "14.x" + "NodeTestVersion": "18.x" }, { "Agent": { @@ -19,7 +19,7 @@ } }, "TestType": "node", - "NodeTestVersion": "16.x", + "NodeTestVersion": "18.x", "ServiceVersion": ["7.0", "7.1", "7.2"] } ], From 1682b7e6335525399a11a1b675dfbd80b22d4872 Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:27:08 +0000 Subject: [PATCH 3/7] update communication --- .../phone-numbers-livetest-matrix.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/communication/communication-phone-numbers/phone-numbers-livetest-matrix.json b/sdk/communication/communication-phone-numbers/phone-numbers-livetest-matrix.json index a148690de30a..6e858ea458b6 100644 --- a/sdk/communication/communication-phone-numbers/phone-numbers-livetest-matrix.json +++ b/sdk/communication/communication-phone-numbers/phone-numbers-livetest-matrix.json @@ -21,7 +21,7 @@ "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "true" } }, - "NodeTestVersion": ["14.x", "16.x", "18.x"], + "NodeTestVersion": ["16.x", "18.x", "20.x"], "TestType": "node", "TestResultsFiles": "**/test-results.xml" }, @@ -53,7 +53,7 @@ "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "false" } }, - "NodeTestVersion": "14.x" + "NodeTestVersion": "18.x" }, { "Agent": { @@ -63,7 +63,7 @@ } }, "TestType": "node", - "NodeTestVersion": "14.x", + "NodeTestVersion": "18.x", "DependencyVersion": ["max", "min"], "TestResultsFiles": "**/test-results.xml", "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "true" From 96c5930401d91dcf3d98e07a763b0cca63eb283b Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:29:42 +0000 Subject: [PATCH 4/7] update cosmos --- eng/pipelines/templates/stages/cosmos-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml index c06155c70f78..35410e878afb 100644 --- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml +++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml @@ -38,7 +38,7 @@ stages: MatrixFilters: - TestType=node - DependencyVersion=^$ - - NodeTestVersion=14.x + - NodeTestVersion=18.x - Pool=.*mms-win-2022.* PreSteps: - template: /eng/pipelines/templates/steps/cosmos-integration-public.yml From 36c202cbd09992036c089ec5f3a2072655111c6b Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:29:51 +0000 Subject: [PATCH 5/7] remove node 14 workaround --- eng/pipelines/templates/steps/use-node-test-version.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/eng/pipelines/templates/steps/use-node-test-version.yml b/eng/pipelines/templates/steps/use-node-test-version.yml index 69e889745da7..b8c46ca79cbb 100644 --- a/eng/pipelines/templates/steps/use-node-test-version.yml +++ b/eng/pipelines/templates/steps/use-node-test-version.yml @@ -6,14 +6,6 @@ steps: parameters: NodeVersion: $(NodeTestVersion) - # Node 14.x uses package node-gyp@5.1.0 which is not compatible with win2022. - # Following the readme to upgrade to the latest one. Readme: https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md - - pwsh: | - npm install --global node-gyp@latest - npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - displayName: Upgrade node-gyp version in Node 14x - condition: and(eq(variables['Pool'], 'azsdk-pool-mms-win-2022-general'), eq(variables['NodeTestVersion'], '14.x')) - # Packages with native dependencies must be reinstalled after changing Node versions - pwsh: | $nativeDependencySymlinkPaths = "common/temp/node_modules/.pnpm/node_modules/keytar,common/temp/node_modules/.pnpm/node_modules/@azure/msal-node-extensions" From 3cb0b13fe9a12953a6ff75acfa86e806fe72a980 Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:30:01 +0000 Subject: [PATCH 6/7] update smoke --- eng/pipelines/templates/jobs/smoke.tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml index c6be937a0c37..23f297b473f9 100644 --- a/eng/pipelines/templates/jobs/smoke.tests.yml +++ b/eng/pipelines/templates/jobs/smoke.tests.yml @@ -55,24 +55,24 @@ jobs: condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['check_smoke_tests.RunSmokeTests'], true)) strategy: matrix: - Mac Node14 (AzureCloud): + Mac Node18 (AzureCloud): Pool: Azure Pipelines OSVmImage: "macos-11" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(AzureCloudArmTemplateParameters) - NodeTestVersion: "14.x" + NodeTestVersion: "18.x" Windows Node16 (AzureCloud): Pool: "azsdk-pool-mms-win-2022-general" OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(AzureCloudArmTemplateParameters) NodeTestVersion: "16.x" - Linux Node14 (AzureCloud): + Linux Node18 (AzureCloud): Pool: "azsdk-pool-mms-ubuntu-2004-general" OSVmImage: "MMSUbuntu20.04" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(AzureCloudArmTemplateParameters) - NodeTestVersion: "14.x" + NodeTestVersion: "18.x" Linux Node16 (AzureCloud): Pool: "azsdk-pool-mms-ubuntu-2004-general" OSVmImage: "MMSUbuntu20.04" From d40e7e920dee869f65d0038b736553faa13bc119 Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Mon, 2 Oct 2023 19:48:34 +0000 Subject: [PATCH 7/7] fix formatting --- sdk/keyvault/keyvault-admin/platform-matrix.json | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/keyvault/keyvault-admin/platform-matrix.json b/sdk/keyvault/keyvault-admin/platform-matrix.json index 86349f185e04..119736de7268 100644 --- a/sdk/keyvault/keyvault-admin/platform-matrix.json +++ b/sdk/keyvault/keyvault-admin/platform-matrix.json @@ -9,7 +9,6 @@ } }, "Versions": { - "16.x_service_version_7_2": { "NodeTestVersion": "16.x", "ServiceVersion": "7.2"