From 10ed30ebd86448744bbc22d224499fdd190f9de7 Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Mon, 8 Jan 2024 13:51:24 +0530
Subject: [PATCH] Drop Nodejs v18 job

As nodejs v20 job is passing in horizon and all horizon
plugins [1]. So we didn't require the nodejs v18 job.

This patch removes the nodejs v18 job definition from
``.zuul.d/nodejs-jobs.yaml`` and other nodejs v18 job
references.

[1] https://review.opendev.org/c/openstack/horizon/+/904934

Change-Id: I3a27799b4864c572a2ef7bf7477ea2b21eb8f395
---
 .zuul.d/nodejs-jobs.yaml    | 34 +---------------------------------
 .zuul.d/project.yaml        |  2 --
 .zuul.d/xstatic-master.yaml |  6 ------
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/.zuul.d/nodejs-jobs.yaml b/.zuul.d/nodejs-jobs.yaml
index 2e76c157d4..0b3f4b9820 100644
--- a/.zuul.d/nodejs-jobs.yaml
+++ b/.zuul.d/nodejs-jobs.yaml
@@ -1,17 +1,3 @@
-- job:
-    name: horizon-nodejs18-run-lint
-    parent: nodejs-run-lint
-    description: |
-      Run lint using Node 18 for horizon plugins.
-    vars:
-      node_version: 18
-      tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
-    nodeset: debian-bullseye
-    pre-run: playbooks/horizon-nodejs/pre.yaml
-    required-projects:
-      - openstack/horizon
-      - openstack/requirements
-
 - job:
     name: horizon-nodejs20-run-lint
     parent: nodejs-run-lint
@@ -26,20 +12,6 @@
       - openstack/horizon
       - openstack/requirements
 
-- job:
-    name: horizon-nodejs18-run-test
-    parent: nodejs-run-test-browser
-    description: |
-      Run test using Node 18 for horizon plugins.
-    vars:
-      node_version: 18
-      tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
-    pre-run: playbooks/horizon-nodejs/pre.yaml
-    nodeset: debian-bullseye
-    required-projects:
-      - openstack/horizon
-      - openstack/requirements
-
 - job:
     name: horizon-nodejs20-run-test
     parent: nodejs-run-test-browser
@@ -58,20 +30,16 @@
     name: horizon-nodejs-jobs
     description: |
       This project template is defined to run lint and test jobs using
-      Node LTS version (i.e. 18 now) for horizon plugins. horizon plugins
+      Node LTS version (i.e. 20 now) for horizon plugins. horizon plugins
       can use this template to run nodejs jobs. So if we want to update
       nodejs version in horizon plugins we can update this template to use
       the job with the latest node version and not many changes are required
       in the horizon plugins side.
     check:
       jobs:
-        - horizon-nodejs18-run-lint
-        - horizon-nodejs18-run-test
         - horizon-nodejs20-run-lint
         - horizon-nodejs20-run-test
     gate:
       jobs:
-        - horizon-nodejs18-run-lint
-        - horizon-nodejs18-run-test
         - horizon-nodejs20-run-lint
         - horizon-nodejs20-run-test
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 5299c95fde..bedb2f1222 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -28,10 +28,8 @@
       jobs:
         - horizon-integration-tests-xstatic-master
         - horizon-tox-py36-xstatic-master
-        - horizon-nodejs18-run-test-xstatic-master
         - horizon-nodejs20-run-test-xstatic-master
     periodic:
       jobs:
-        - horizon-nodejs18-run-test
         - horizon-nodejs20-run-test
         - horizon-integration-tests
diff --git a/.zuul.d/xstatic-master.yaml b/.zuul.d/xstatic-master.yaml
index 380c404adf..def16d83b9 100644
--- a/.zuul.d/xstatic-master.yaml
+++ b/.zuul.d/xstatic-master.yaml
@@ -29,12 +29,6 @@
     parent: openstack-tox-py39
     required-projects: *xstatic-projects
 
-- job:
-    name: horizon-nodejs18-run-test-xstatic-master
-    parent: horizon-nodejs18-run-test
-    required-projects: *xstatic-projects
-    pre-run: playbooks/npm-test-xstatic-master/pre.yaml
-
 - job:
     name: horizon-nodejs20-run-test-xstatic-master
     parent: horizon-nodejs20-run-test