From 1768ef70b9e4e49fb9f0b1648e76b76ecbc0ea3b Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Thu, 13 Jun 2024 16:49:12 +0200
Subject: [PATCH] Update cross-horizon-npm job

Horizon has dropped support for python3.8, so we need to run this job on
a node that has a more recent python version. This also needs to use a
more recent node version, then. Make the job inherit the same parent job
definition that horizon is using in order to avoid duplication. Drop our
generic requirements-cross-npm template since it is no longer being
used.

Change-Id: I0ea11984e63b885668ed5842e1c6221739e18343
---
 .zuul.d/cross-jobs.yaml | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/.zuul.d/cross-jobs.yaml b/.zuul.d/cross-jobs.yaml
index 1585497add..9460e34955 100644
--- a/.zuul.d/cross-jobs.yaml
+++ b/.zuul.d/cross-jobs.yaml
@@ -21,30 +21,6 @@
       - upper-constraints.txt
       - .zuul.d/cross-jobs.yaml
 
-- job:
-    name: requirements-cross-npm
-    parent: nodejs-run-test-browser
-    timeout: 2400
-    description: |
-      A parent job to perform cross-repository npm tests.
-
-      Inherit from this job, and add the intended project to
-      ``required-projects``.
-
-      Also, set the following variable:
-
-      .. zuul:jobvar:: tox_envlist
-
-         Use the specified tox environments (``ALL`` selects all).
-    nodeset: ubuntu-focal
-    vars:
-      zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
-      tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
-    pre-run: playbooks/nodejs-pre.yaml
-    files:
-      - upper-constraints.txt
-      - .zuul.d/cross-jobs.yaml
-
 - job:
     name: cross-aodh-py311
     parent: requirements-cross-test
@@ -111,11 +87,18 @@
 
 - job:
     name: cross-horizon-npm
-    parent: requirements-cross-npm
+    parent: horizon-nodejs20-run-test
+    timeout: 2400
     description: Run cross-project tests on horizon with npm.
     required-projects: openstack/horizon
     vars:
+      tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
       tox_envlist: npm
+      zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
+    pre-run: playbooks/nodejs-pre.yaml
+    files:
+      - upper-constraints.txt
+      - .zuul.d/cross-jobs.yaml
 
 - job:
     name: cross-keystone-py311