ansible: replace Ubuntu 18.04 Jenkins workspace with 22.04

Closes: #3713
nodejs · May 12, 2024 · de6ae20 · de6ae20
1 parent 56eaa17
commit de6ae20
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -165,9 +165,9 @@ hosts:
         rhel8-x64-2: {ip: 169.61.75.58, build_test_v8: yes}
         rhel8-x64-3: {ip: 52.117.26.13, build_test_v8: yes}
         rhel9-x64-1: {ip: 169.60.150.92, swap_file_size_mb: 2048}
-        ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6}
         ubuntu2204-x64-1: {ip: 169.60.150.82}
         ubuntu2204-x64-2: {ip: 169.44.168.2}
+        ubuntu2204-x64-3: {ip: 52.117.26.14, alias: jenkins-workspace-6}
         ubuntu2204_docker-x64-1: {ip: 52.117.26.9}
 
     - equinix_mnx:

diff --git a/ansible/playbooks/jenkins/worker/create.yml b/ansible/playbooks/jenkins/worker/create.yml
@@ -69,7 +69,7 @@
 - hosts:
     - test-equinix-ubuntu2204-x64-1
     - test-equinix-ubuntu2204-x64-2
-    - test-ibm-ubuntu1804-x64-1
+    - test-ibm-ubuntu2204-x64-3
 
   roles:
     - jenkins-workspace
@@ -83,7 +83,7 @@
   - release
   - "!test-equinix-ubuntu2204-x64-1"
   - "!test-equinix-ubuntu2204-x64-2"
-  - "!test-ibm-ubuntu1804-x64-1"
+  - "!test-ibm-ubuntu2204-x64-3"
   tasks:
     - name: remove node and npm packages
       when:

diff --git a/ansible/roles/jenkins-workspace/tasks/main.yml b/ansible/roles/jenkins-workspace/tasks/main.yml
@@ -128,19 +128,14 @@
   check_mode: no
   register: release_codename
 
-- name: Add nodesource repo
+- name: Add nodesource 20 repo
   apt_repository:
-    repo: deb https://deb.nodesource.com/node_16.x {{ release_codename.stdout }} main
+    repo: deb https://deb.nodesource.com/node_20.x {{ release_codename.stdout }} main
     state: present
-  
-- name: Remove nodesource 14 repos
+
+- name: Remove nodesource 16 repo
   apt_repository:
-    repo: deb https://deb.nodesource.com/node_14.x {{ release_codename.stdout }} main
-    state: absent
-
-- name: Remove nodesource 12 repos
-  apt_repository:
-    repo: deb https://deb.nodesource.com/node_12.x {{ release_codename.stdout }} main
+    repo: deb https://deb.nodesource.com/node_16.x {{ release_codename.stdout }} main
     state: absent
 
 - name: Install node