Backed out 3 changesets (bug 1762571) for causing xpcshell failures o…

…n test_trr_httpssvc_wrap.js. CLOSED TREE Backed out changeset 9e6eb444acb4 (bug 1762571) Backed out changeset f24051722cee (bug 1762571) Backed out changeset 0ead2f6d0582 (bug 1762571)
dothq · Jun 30, 2022 · eaae724 · eaae724
1 parent 421e48f
commit eaae724
Show file tree

Hide file tree

Showing 15 changed files with 517 additions and 7,616 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/python/mozbuild/mozbuild/nodeutil.py b/python/mozbuild/mozbuild/nodeutil.py
@@ -13,8 +13,8 @@
 from mozfile import which
 from six import PY3
 
-NODE_MIN_VERSION = StrictVersion("12.22.1")
-NPM_MIN_VERSION = StrictVersion("6.14.12")
+NODE_MIN_VERSION = StrictVersion("10.23.1")
+NPM_MIN_VERSION = StrictVersion("6.14.10")
 
 
 def find_node_paths():

diff --git a/taskcluster/ci/build/linux-base-toolchains.yml b/taskcluster/ci/build/linux-base-toolchains.yml
@@ -43,7 +43,7 @@ linux64-base-toolchains/opt:
             - linux64-dump_syms
             - linux64-sccache
             - linux64-nasm-2.14.02
-            - linux64-node-12
+            - linux64-node-10
             - sysroot-x86_64-linux-gnu
 
 linux64-base-toolchains/debug:
@@ -83,7 +83,7 @@ linux64-base-toolchains/debug:
             - linux64-dump_syms
             - linux64-sccache
             - linux64-nasm-2.14.02
-            - linux64-node-12
+            - linux64-node-10
             - sysroot-x86_64-linux-gnu
 
 linux64-base-toolchains-clang/opt:
@@ -118,7 +118,7 @@ linux64-base-toolchains-clang/opt:
             - linux64-cbindgen
             - linux64-dump_syms
             - linux64-nasm-2.14.02
-            - linux64-node-12
+            - linux64-node-10
             - sysroot-x86_64-linux-gnu
 
 linux64-base-toolchains-clang/debug:
@@ -156,5 +156,5 @@ linux64-base-toolchains-clang/debug:
             - linux64-cbindgen
             - linux64-dump_syms
             - linux64-nasm-2.14.02
-            - linux64-node-12
+            - linux64-node-10
             - sysroot-x86_64-linux-gnu
diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
@@ -473,6 +473,17 @@ makecab:
         repo: https://github.com/glandium/rust-makecab/
         revision: 73a4605b97123bf7221533c671f27f234d974b02
 
+nodejs-10-linux64:
+    description: nodejs 10 for x64 linux
+    fetch:
+        type: static-url
+        url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-linux-x64.tar.xz
+        sha256: 207e5ec77ca655ba6fcde922d6b329acbb09898b0bd793ccfcce6c27a36fdff0
+        size: 13139076
+        artifact-name: nodejs.tar.zst
+        strip-components: 1
+        add-prefix: node/
+
 nodejs-12-linux64:
     description: nodejs 12 for x64 linux
     fetch:
@@ -495,6 +506,17 @@ nodejs-16-linux64:
         strip-components: 1
         add-prefix: node/
 
+nodejs-10-macosx64:
+    description: nodejs 10 for x64 macOS
+    fetch:
+        type: static-url
+        url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-darwin-x64.tar.xz
+        sha256: febfdabd98ab5b8f8fdff32ab8c111d834083805bf042ab65c923cc22609c99d
+        size: 12233276
+        artifact-name: nodejs.tar.zst
+        strip-components: 1
+        add-prefix: node/
+
 nodejs-12-macosx64:
     description: nodejs 12 for x64 macOS
     fetch:
@@ -528,6 +550,17 @@ nodejs-16-macosx64-arm64:
         strip-components: 1
         add-prefix: node/
 
+nodejs-10-win32:
+    description: nodejs 10 for x86 Windows
+    fetch:
+        type: static-url
+        url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-win-x86.zip
+        sha256: c3be0fd50c218cc52e85377c9e22d7d2110d72de95bdbc9447145b246330f818
+        size: 16806899
+        artifact-name: nodejs.tar.zst
+        strip-components: 1
+        add-prefix: node/
+
 nodejs-12-win32:
     description: nodejs 12 for x86 Windows
     fetch:
@@ -550,6 +583,17 @@ nodejs-16-win32:
         strip-components: 1
         add-prefix: node/
 
+nodejs-10-win64:
+    description: nodejs 10 for x64 Windows
+    fetch:
+        type: static-url
+        url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-win-x64.zip
+        sha256: 497996aa1037b6f7f492c1d275bb90140269223939525286b4e95babad16f0de
+        size: 18307638
+        artifact-name: nodejs.tar.zst
+        strip-components: 1
+        add-prefix: node/
+
 nodejs-12-win64:
     description: nodejs 12 for x64 Windows
     fetch:

diff --git a/taskcluster/ci/perftest/android.yml b/taskcluster/ci/perftest/android.yml
@@ -6,7 +6,7 @@
 job-defaults:
     fetches:
         toolchain:
-            - linux64-node
+            - linux64-node-12
             - linux64-geckodriver
     run:
         sparse-profile: perftest

diff --git a/taskcluster/ci/perftest/linux.yml b/taskcluster/ci/perftest/linux.yml
@@ -6,7 +6,7 @@ job-defaults:
     worker-type: t-linux-talos-1804
     fetches:
         toolchain:
-            - linux64-node
+            - linux64-node-12
             - linux64-geckodriver
         build:
             - artifact: target.mozinfo.json

diff --git a/taskcluster/ci/perftest/windows.yml b/taskcluster/ci/perftest/windows.yml
@@ -9,7 +9,7 @@ job-defaults:
             - artifact: target.perftests.tests.tar.gz
             - artifact: target.zip
         toolchain:
-            - win64-node
+            - win64-node-12
             - win64-geckodriver
     platform: windows10-64-shippable/opt
     require-build:

diff --git a/taskcluster/ci/source-test/node.yml b/taskcluster/ci/source-test/node.yml
@@ -82,12 +82,7 @@ debugger-tests:
         cache-dotcache: true
         cwd: '{checkout}'
         command: >
-            # Re-use rather than re-installing to avoid hitting/requiring
-            # nodejs servers for downloads
-            cp -r /build/node_modules_eslint node_modules &&
-            cp -r /build/node_modules_eslint-plugin-mozilla/ tools/lint/eslint/eslint-plugin-mozilla/node_modules &&
-            ln -s ../tools/lint/eslint/eslint-plugin-mozilla node_modules &&
-            ln -s ../tools/lint/eslint/eslint-plugin-spidermonkey-js node_modules &&
+            npm install &&
             cd devtools/client/debugger/ &&
             yarn &&
             node bin/try-runner.js
@@ -113,12 +108,7 @@ devtools-tests:
         cache-dotcache: true
         cwd: '{checkout}'
         command: >
-            # Re-use rather than re-installing to avoid hitting/requiring
-            # nodejs servers for downloads
-            cp -r /build/node_modules_eslint node_modules &&
-            cp -r /build/node_modules_eslint-plugin-mozilla/ tools/lint/eslint/eslint-plugin-mozilla/node_modules &&
-            ln -s ../tools/lint/eslint/eslint-plugin-mozilla node_modules &&
-            ln -s ../tools/lint/eslint/eslint-plugin-spidermonkey-js node_modules &&
+            npm install &&
             cd devtools/client/bin/ &&
             node devtools-node-test-runner.js --suite=aboutdebugging &&
             node devtools-node-test-runner.js --suite=accessibility &&
@@ -150,12 +140,7 @@ devtools-verify-bundle:
         cache-dotcache: true
         cwd: '{checkout}'
         command: >
-            # Re-use rather than re-installing to avoid hitting/requiring
-            # nodejs servers for downloads
-            cp -r /build/node_modules_eslint node_modules &&
-            cp -r /build/node_modules_eslint-plugin-mozilla/ tools/lint/eslint/eslint-plugin-mozilla/node_modules &&
-            ln -s ../tools/lint/eslint/eslint-plugin-mozilla node_modules &&
-            ln -s ../tools/lint/eslint/eslint-plugin-spidermonkey-js node_modules &&
+            npm install &&
             cd devtools/client/debugger &&
             yarn &&
             node bin/bundle.js &&

diff --git a/taskcluster/ci/source-test/python.yml b/taskcluster/ci/source-test/python.yml
@@ -412,11 +412,11 @@ mozperftest:
         toolchain:
             by-platform:
                 linux1804-64/opt:
-                    - linux64-node
+                    - linux64-node-12
                 macosx1015-64/opt:
-                    - macosx64-node
+                    - macosx64-node-12
                 windows10-64/opt:
-                    - win64-node
+                    - win64-node-12
     when:
         files-changed:
             - 'testing/performance/**'
@@ -469,9 +469,9 @@ featuregates:
         toolchain:
             by-platform:
                 linux1804-64/opt:
-                    - linux64-node
+                    - linux64-node-12
                 windows10-64/opt:
-                    - win64-node
+                    - win64-node-12
     when:
         files-changed:
             - 'toolkit/components/featuregates/**'
@@ -544,11 +544,11 @@ telemetry-python:
         toolchain:
             by-platform:
                 linux1804-64/opt:
-                    - linux64-node
+                    - linux64-node-12
                 macosx1015-64/opt:
-                    - macosx64-node
+                    - macosx64-node-12
                 windows10-64/opt:
-                    - win64-node
+                    - win64-node-12
     when:
         files-changed:
             - 'toolkit/components/telemetry/**'

diff --git a/taskcluster/ci/toolchain/node.yml b/taskcluster/ci/toolchain/node.yml
@@ -13,36 +13,50 @@ job-defaults:
         script: repack-node.sh
         toolchain-artifact: public/build/node.tar.zst
 
+linux64-node-10:
+    treeherder:
+        symbol: TL(node-10)
+    fetches:
+        fetch:
+            - nodejs-10-linux64
+
+
 linux64-node-12:
     treeherder:
         symbol: TL(node-12)
+    run:
+        toolchain-alias: linux64-node
     fetches:
         fetch:
             - nodejs-12-linux64
 
 linux64-node-16:
     treeherder:
         symbol: TL(node-16)
-    run:
-        toolchain-alias:
-            - linux64-node
     fetches:
         fetch:
             - nodejs-16-linux64
 
+macosx64-node-10:
+    treeherder:
+        symbol: TM(node-10)
+    fetches:
+        fetch:
+            - nodejs-10-macosx64
+
 macosx64-node-12:
     treeherder:
         symbol: TM(node-12)
+    run:
+        toolchain-alias:
+            - macosx64-node
     fetches:
         fetch:
             - nodejs-12-macosx64
 
 macosx64-node-16:
     treeherder:
         symbol: TM(node-16)
-    run:
-        toolchain-alias:
-            - macosx64-node
     fetches:
         fetch:
             - nodejs-16-macosx64
@@ -57,26 +71,43 @@ macosx64-aarch64-node-16:
         fetch:
             - nodejs-16-macosx64-arm64
 
+win64-node-10:
+    treeherder:
+        symbol: TW64(node-10)
+    fetches:
+        fetch:
+            - nodejs-10-win64
+
 win64-node-12:
     treeherder:
         symbol: TW64(node-12)
+    run:
+        toolchain-alias: win64-node
     fetches:
         fetch:
             - nodejs-12-win64
 
 win64-node-16:
     treeherder:
         symbol: TW64(node-16)
-    run:
-        toolchain-alias:
-            - win64-node
     fetches:
         fetch:
             - nodejs-16-win64
 
+win32-node-10:
+    treeherder:
+        symbol: TW32(node-10)
+    fetches:
+        fetch:
+            - nodejs-10-win32
+
 win32-node-12:
     treeherder:
         symbol: TW32(node-12)
+    run:
+        toolchain-alias:
+            - win32-node
+            - win64-aarch64-node
     fetches:
         fetch:
             - nodejs-12-win32
@@ -86,7 +117,7 @@ win32-node-16:
         symbol: TW32(node-16)
     run:
         toolchain-alias:
-            - win32-node
+            - win64-aarch64-node-16
     fetches:
         fetch:
             - nodejs-16-win32
diff --git a/taskcluster/docker/lint/system-setup.sh b/taskcluster/docker/lint/system-setup.sh
@@ -46,7 +46,7 @@ cd /build
 # shellcheck disable=SC1091
 . install-node.sh
 
-npm install -g yarn@1.22.18
+npm install -g yarn@1.9.4
 
 /build/tooltool.py fetch -m /tmp/eslint.tt
 mv /build/node_modules /build/node_modules_eslint

diff --git a/taskcluster/docker/recipes/install-node.sh b/taskcluster/docker/recipes/install-node.sh
@@ -3,13 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# This script installs Node v16.
+# This script installs Node v12.
 # XXX For now, this should match the version installed in
 # taskcluster/scripts/misc/repack-node.sh. Later we'll get the ESLint builder
 # to use the linux64-node toolchain directly.
 
-wget -O node.xz --progress=dot:mega https://nodejs.org/download/release/v16.14.2/node-v16.14.2-linux-x64.tar.xz
-echo 'e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b' node.xz | sha256sum -c
+wget -O node.xz --progress=dot:mega https://nodejs.org/download/release/v12.22.1/node-v12.22.1-linux-x64.tar.xz
+echo '8b537282c222ae4a40e019a52f769ca27b6640699bdde1510375e8d72da7d041' node.xz | sha256sum -c
 tar -C /usr/local -xJ --strip-components 1 < node.xz
 node -v  # verify
 npm -v
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt b/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt
@@ -1,10 +1,10 @@
 [
   {
-    "filename": "eslint-plugin-mozilla.tar.gz",
-    "size": 7633683,
     "algorithm": "sha512",
-    "digest": "fe8cd3a968ae05bea2e2c7c1a8772e7b70283225751f0afbec960090359b48eb684cfa8c9ffaf8d86c61a35fdd732b4a88eeed11e19a314b4f2e914b635553ab",
+    "visibility": "public",
+    "filename": "eslint-plugin-mozilla.tar.gz",
     "unpack": true,
-    "visibility": "public"
+    "digest": "c2e677fb0bb6e007cb847beae7d75f8a3d3c6dfeb03ac2175972cfae8eaca225b3539b39161bb4ff8d542f2ece7553f078cf4c4f15a8f93008e40a2d4a427f0b",
+    "size": 5567208
   }
 ]