From de6ae20c9701da6e56713d5eaa6b213d5b0c9e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 12 May 2024 08:38:12 +0200 Subject: [PATCH] ansible: replace Ubuntu 18.04 Jenkins workspace with 22.04 Closes: https://github.com/nodejs/build/issues/3713 --- ansible/inventory.yml | 2 +- ansible/playbooks/jenkins/worker/create.yml | 4 ++-- ansible/roles/jenkins-workspace/tasks/main.yml | 15 +++++---------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 8a782d52f..3fe7653f0 100644 --- 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 index 7e8a67e17..559b70850 100644 --- 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 index c6125cad7..b54c7a28a 100644 --- 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