From 28607bbc26a6645247c45169724597f842ef6e7c Mon Sep 17 00:00:00 2001 From: Damian Fajfer Date: Wed, 13 Aug 2025 11:27:22 +0200 Subject: [PATCH] Remove version defaults for nodejs jobs According to Matrix room discussion we've stopped putting version defaults in zuul-jobs at all for new things so I deleted them as it was interferring with react version updates Change-Id: Id2e26a6099ba276feb804ce49a6b591282cc2b0c --- .../defaults/main.yaml | 1 - zuul.d/js-jobs.yaml | 15 ++------------- zuul.d/python-jobs.yaml | 3 --- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/roles/ensure-javascript-build-tool/defaults/main.yaml b/roles/ensure-javascript-build-tool/defaults/main.yaml index 237b94895..9739eb171 100644 --- a/roles/ensure-javascript-build-tool/defaults/main.yaml +++ b/roles/ensure-javascript-build-tool/defaults/main.yaml @@ -1,2 +1 @@ -node_version: '14' zuul_work_dir: "{{ zuul.project.src_dir }}" diff --git a/zuul.d/js-jobs.yaml b/zuul.d/js-jobs.yaml index b7cd55554..405795ddb 100644 --- a/zuul.d/js-jobs.yaml +++ b/zuul.d/js-jobs.yaml @@ -19,7 +19,6 @@ Command to use for running the package manager, such as npm or yarn. .. zuul:jobvar:: node_version - :default: 14 The version of Node to use. @@ -37,7 +36,6 @@ post-run: playbooks/javascript/post.yaml vars: js_build_command: build - node_version: 14 - job: name: build-javascript-source-tarball @@ -48,7 +46,6 @@ Responds to these variables: .. zuul:jobvar:: node_version - :default: 14 The version of Node to use. @@ -80,7 +77,6 @@ Command to pass to npm. .. zuul:jobvar:: node_version - :default: 14 The version of Node to use. @@ -114,7 +110,6 @@ Command to use for running the package manager, such as npm or yarn. .. zuul:jobvar:: node_version - :default: 20 The version of Node to use. Netlify CLI requires at least v18. @@ -145,8 +140,6 @@ a token can be found at https://docs.netlify.com/cli/get-started/#obtain-a-token-in-the-netlify-ui post-run: playbooks/javascript/netlify-publish.yaml - vars: - node_version: 20 - job: name: nodejs-run-test @@ -157,9 +150,8 @@ Responds to these variables: .. zuul:jobvar:: node_version - :default: 14 - The version of Node to use. + The version of Node to use. .. zuul:jobvar:: zuul_work_dir :default: {{ zuul.project.src_dir }} @@ -183,9 +175,8 @@ Responds to these variables: .. zuul:jobvar:: node_version - :default: 14 - The version of Node to use. + The version of Node to use. .. zuul:jobvar:: zuul_work_dir :default: {{ zuul.project.src_dir }} @@ -209,7 +200,6 @@ Responds to these variables: .. zuul:jobvar:: node_version - :default: 14 The version of Node to use. @@ -234,7 +224,6 @@ Responds to these variables: .. zuul:jobvar:: node_version - :default: 14 The version of Node to use. diff --git a/zuul.d/python-jobs.yaml b/zuul.d/python-jobs.yaml index 796aba2f9..938b1666f 100644 --- a/zuul.d/python-jobs.yaml +++ b/zuul.d/python-jobs.yaml @@ -327,7 +327,6 @@ Command to pass to npm. .. zuul:jobvar:: node_version - :default: 14 The version of Node to use. @@ -632,5 +631,3 @@ `.markdownlint.json` that is configured according to https://github.com/DavidAnson/markdownlint#optionsconfig to control rule specifics. - vars: - node_version: 18