From 5eff8a32eb240eecbcdc8f3917aa08f229582e6d Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 21 May 2025 17:23:11 +0200 Subject: [PATCH 1/3] Add `node-config-schema.json` to expected files in `v22.x` --- ansible/www-standalone/tools/promote/expected_assets/v22.x | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/www-standalone/tools/promote/expected_assets/v22.x b/ansible/www-standalone/tools/promote/expected_assets/v22.x index 267a51edf..210f66924 100644 --- a/ansible/www-standalone/tools/promote/expected_assets/v22.x +++ b/ansible/www-standalone/tools/promote/expected_assets/v22.x @@ -1,6 +1,7 @@ docs/ docs/apilinks.json docs/api/ +docs/node-config-schema.json node-{VERSION}-aix-ppc64.tar.gz node-{VERSION}-darwin-arm64.tar.gz node-{VERSION}-darwin-arm64.tar.xz From 077384413510c57372ff917e577c3744fcd4b984 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 21 May 2025 17:55:05 +0200 Subject: [PATCH 2/3] Update check_r2_assets.mjs --- .../tools/promote/test/check_r2_assets.mjs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs b/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs index 05a2c438c..877752b99 100644 --- a/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs +++ b/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs @@ -8,7 +8,7 @@ import { exit } from 'node:process'; const testcases = [ { name: 'No rclone', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '', setup: async function setup (context) { const command = `rclone lsjson ${context.r2StagingDir} --no-modtime --no-mimetype -R --max-depth 2`; @@ -29,7 +29,7 @@ const testcases = [ }, { name: 'Everything is in staging, nothing in dist, good to go', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + @@ -42,7 +42,7 @@ const testcases = [ }, { name: 'Not quite everything is in staging, missing two assets, nothing in dist', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + @@ -58,7 +58,7 @@ const testcases = [ }, { name: 'Everything is in staging and everything in dist', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + @@ -73,7 +73,7 @@ const testcases = [ }, { name: 'Everything is in dist except for the armv7l files, but they are in staging', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + @@ -88,7 +88,7 @@ const testcases = [ }, { name: 'Everything is in dist except for the armv7l files, but they are in staging. Ignores SHASUMS in staging.', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + @@ -103,7 +103,7 @@ const testcases = [ }, { name: 'Everything is in dist except for the armv7l files, but they are in staging. Ignores SHASUMS in dist.', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + @@ -118,7 +118,7 @@ const testcases = [ }, { name: 'Unexpected files in dist', - version: 'v22.12.0', + version: 'v22.16.0', expectedStdout: '... Checking R2 assets\n' + '... Expecting a total of 47 assets for v22.x\n' + From 5f0536e1ae638e07a37eb616335f48b5158e33b6 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 21 May 2025 18:00:30 +0200 Subject: [PATCH 3/3] Update check_r2_assets.mjs --- .../tools/promote/test/check_r2_assets.mjs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs b/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs index 877752b99..9b64d5bfd 100644 --- a/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs +++ b/ansible/www-standalone/tools/promote/test/check_r2_assets.mjs @@ -37,7 +37,7 @@ const testcases = [ '... 0 assets already promoted in R2\n' + ' \u001b[32m\u001b[1m✓\u001b[22m\u001b[39m Complete set of expected assets in place for v22.x\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.16.0.json'); } }, { @@ -49,11 +49,11 @@ const testcases = [ '... 45 assets waiting in R2 staging\n' + '... 0 assets already promoted in R2\n' + ' \x1B[33m\x1B[1m⚠\x1B[22m\x1B[39m The following assets are expected for v22.x but are currently missing from R2 staging:\n' + - ' • node-v22.12.0-linux-armv7l.tar.gz\n' + - ' • node-v22.12.0-linux-armv7l.tar.xz\n' + + ' • node-v22.16.0-linux-armv7l.tar.gz\n' + + ' • node-v22.16.0-linux-armv7l.tar.xz\n' + ' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('partial-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('partial-v22.16.0.json'); } }, { @@ -67,8 +67,8 @@ const testcases = [ ' \u001b[32m\u001b[1m✓\u001b[22m\u001b[39m Complete set of expected assets in place for v22.x\n' + ' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.12.0.json'); - context.rcloneLs[context.r2DistDir] = await fixture('all-present-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.16.0.json'); + context.rcloneLs[context.r2DistDir] = await fixture('all-present-v22.16.0.json'); } }, { @@ -82,8 +82,8 @@ const testcases = [ ' \u001b[32m\u001b[1m✓\u001b[22m\u001b[39m Complete set of expected assets in place for v22.x\n' + ' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.12.0.json'); - context.rcloneLs[context.r2DistDir] = await fixture('partial-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.16.0.json'); + context.rcloneLs[context.r2DistDir] = await fixture('partial-v22.16.0.json'); } }, { @@ -97,8 +97,8 @@ const testcases = [ ' \u001b[32m\u001b[1m✓\u001b[22m\u001b[39m Complete set of expected assets in place for v22.x\n' + ' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('with-shasums-v22.12.0.json'); - context.rcloneLs[context.r2DistDir] = await fixture('partial-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('with-shasums-v22.16.0.json'); + context.rcloneLs[context.r2DistDir] = await fixture('partial-v22.16.0.json'); } }, { @@ -112,8 +112,8 @@ const testcases = [ ' \u001b[32m\u001b[1m✓\u001b[22m\u001b[39m Complete set of expected assets in place for v22.x\n' + ' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('with-shasums-v22.12.0.json'); - context.rcloneLs[context.r2DistDir] = await fixture('partial-with-shasums-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('with-shasums-v22.16.0.json'); + context.rcloneLs[context.r2DistDir] = await fixture('partial-with-shasums-v22.16.0.json'); } }, { @@ -132,7 +132,7 @@ const testcases = [ ' https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/v22.x\n' + ' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n', setup: async function setup (context) { - context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.12.0.json'); + context.rcloneLs[context.r2StagingDir] = await fixture('all-present-v22.16.0.json'); context.rcloneLs[context.r2DistDir] = await fixture('unexpected-files.json'); } }, @@ -201,7 +201,7 @@ describe(`${basename(import.meta.filename, '.mjs')} tests`, async () => { captureConsole(context); const exitFunc = context.mock.fn(); process.exit = exitFunc; - await check_r2_assets.checkArgs([ process.execPath, 'check_r2_assets.mjs', 'foo', 'v22.12.0' ]); + await check_r2_assets.checkArgs([ process.execPath, 'check_r2_assets.mjs', 'foo', 'v22.16.0' ]); process.exit = exit; restoreConsole(); assert.strictEqual(exitFunc.mock.callCount(), 1); @@ -214,7 +214,7 @@ describe(`${basename(import.meta.filename, '.mjs')} tests`, async () => { captureConsole(context); const exitFunc = context.mock.fn(); process.exit = exitFunc; - await check_r2_assets.checkArgs([ process.execPath, 'check_r2_assets.mjs', 'v22.12.0', 'bar' ]); + await check_r2_assets.checkArgs([ process.execPath, 'check_r2_assets.mjs', 'v22.16.0', 'bar' ]); process.exit = exit; restoreConsole(); assert.strictEqual(exitFunc.mock.callCount(), 1);