Skip to content

Commit

Permalink
chore: remove outdated references to ubuntu1404 (#3339)
Browse files Browse the repository at this point in the history
Refs: #3338
  • Loading branch information
targos committed May 7, 2023
1 parent fe593b5 commit 1578478
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 93 deletions.
4 changes: 2 additions & 2 deletions ansible/playbooks/jenkins/host/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#

- hosts:
- infra-digitalocean-ubuntu1404-x64-1
- infra-ibm-ubuntu1804-x64-1
- infra-digitalocean-ubuntu2204-x64-1 # ci.nodejs.org
- infra-ibm-ubuntu1804-x64-1 # ci-release.nodejs.org

roles:
- bootstrap
Expand Down
6 changes: 2 additions & 4 deletions ansible/playbooks/jenkins/host/iptables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
#

- hosts:
- infra-digitalocean-ubuntu1404-x64-1 # ci.nodejs.org
- infra-digitalocean-ubuntu2204-x64-1 # ci.nodejs.org
- infra-ibm-ubuntu1804-x64-1 # ci-release.nodejs.org

vars:
hostgroups: {
'infra-digitalocean-ubuntu1404-x64-1': 'test',
'infra-digitalocean-ubuntu2204-x64-1': 'test',
'infra-ibm-ubuntu1804-x64-1': 'release'
}
jumphost: 'vagg-arm.nodejs.org'


tasks:
- name: add hosts to firewall
Expand Down
9 changes: 0 additions & 9 deletions ansible/roles/baselayout/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@
- cpack
- ctest

- name: ubuntu1404 | update package alternatives
when: os == "ubuntu1404"
alternatives: link=/usr/bin/{{ gcc }} name={{ gcc }} path=/usr/bin/{{ gcc }}-4.9
loop_control:
loop_var: gcc
with_items:
- gcc
- g++

- name: ubuntu1604 | update package alternatives
when: os == "ubuntu1604"
alternatives: link=/usr/bin/{{ gcc }} name={{ gcc }} path=/usr/bin/{{ gcc }}-5
Expand Down
8 changes: 1 addition & 7 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ git_version: 2.10.2
ssh_config: /etc/ssh/sshd_config

sshd_service_map: {
'ubuntu1404': 'ssh',
'smartos17': 'ssh',
'smartos18': 'ssh',
}
Expand All @@ -19,8 +18,7 @@ sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripver

ntp_service: {
chrony: ['rhel8'],
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804'],
ntp_package: ['ubuntu1404']
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804']
}

common_packages: [
Expand Down Expand Up @@ -147,10 +145,6 @@ packages: {
'ccache,curl,git,libfontconfig1,sudo,python3-pip',
],

ubuntu1404: [
'ntp,gcc-8,g++-8,gcc-6,g++-6,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26',
],

# Default gcc/g++ package is 5.
ubuntu1604: [
'gcc-8,g++-8,gcc-6,g++-6,python3.9,python3.9-distutils',
Expand Down
9 changes: 2 additions & 7 deletions ansible/roles/docker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@

ssh_config: /etc/ssh/sshd_config

sshd_service_map: {
'ubuntu1404': 'ssh',
}

sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripversion])|default('sshd') }}"
sshd_service_name: 'sshd'

ntp_service: {
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804'],
ntp_package: ['ubuntu1404']
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804']
}

common_packages: [
Expand Down
17 changes: 1 addition & 16 deletions ansible/roles/java-base/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
# installs java
#

- name: install add-apt-repostory
when: os == "ubuntu1404" and arch != "ppc64"
package: name=software-properties-common state=present

- name: add webupd8 oracle java repository
when: os == "ubuntu1404" and arch != "ppc64"
apt_repository: repo='ppa:webupd8team/java'

- name: add webupd8team oracle java repository
when: os == "debian8"
lineinfile:
Expand All @@ -24,7 +16,7 @@
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886

- name: accept webupd8 oracle java 8 license
when: os == "ubuntu1404" and arch != "ppc64" or os == "debian8"
when: os == "debian8"
debconf: name='oracle-java8-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select'

# if this fails you want to check in vars/main.yml and add package name
Expand Down Expand Up @@ -58,13 +50,6 @@
name: "{{ java_package_name }}"
state: present

- name: install webupd8 oracle java 8 extras
when: java.rc > 0 and os == "ubuntu1404" and arch != "ppc64"
package: name="{{item}}" state=present
with_items:
- ca-certificates
- oracle-java8-set-default

# Uses the AdoptOpenJDK API https://github.com/adoptopenjdk/openjdk-api-v3
# to discover the most recent release for the given adoptopenjdk_version and
# platform.
Expand Down
1 change: 0 additions & 1 deletion ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ packages: {
'smartos': 'openjdk11',
'ubuntu': 'openjdk-17-jre-headless',
'ubuntu1604': 'openjdk-8-jre-headless',
'ubuntu1404': 'oracle-java8-installer',
'ubuntu2204': 'openjdk-17-jre-headless',
}

Expand Down
34 changes: 0 additions & 34 deletions ansible/roles/jenkins-worker/templates/upstart.j2

This file was deleted.

5 changes: 0 additions & 5 deletions ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ init: {
macos: 'macos',
systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'rhel7', 'rhel8', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
svc: 'smartos',
upstart: ['ubuntu12', 'ubuntu1404'],
zos_start: 'zos'
}

Expand Down Expand Up @@ -45,10 +44,6 @@ jenkins_init: {
dest: '/lib/systemd/system/jenkins.service',
src: 'systemd.service.j2'
},
upstart: {
dest: '/etc/init/jenkins.conf',
src: 'upstart.j2'
},
zos_start: {
dest: '{{ home }}/{{ server_user }}/start.sh.utf8',
src: 'zos_start.j2'
Expand Down
3 changes: 0 additions & 3 deletions doc/node-test-commit-matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
- debian9-64
- fedora-last-latest-x64
- fedora-latest-x64
- ubuntu1404-32 (Node < 10)
- ubuntu1404-64 (Node < 12)
- ubuntu1604-32 (Node < 10)
- ubuntu1604-64
- ubuntu1804-64
Expand All @@ -33,7 +31,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
- osx1011
- **node-test-commit-plinux**
- centos7-ppcle (Node >= 12)
- ppcle-ubuntu1404 (Node < 13)
- **node-test-commit-smartos**
- smartos15-64 (Node >= 8 < 10)
- smartos16-64 (Node >= 8 < 12)
Expand Down
2 changes: 1 addition & 1 deletion jenkins/pipelines/llnode-pipeline.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ properties([
string(name: 'NODE_VERSIONS', defaultValue: 'v6 v8 v9 v10 nightly canary', description: 'Space separated list of NODE_VERSIONS to pass to llnode-continuous-integration.'),
string(name: 'LLDB_VERSIONS', defaultValue: '3.9 4.0 5.0 6.0', description: 'Space separated list of LLDB_VERSIONS to pass to llnode-continuous-integration.'),
string(name: 'MACHINES', defaultValue: 'all', description: '''Can be "all" or a space-separated list of nodes, eg:
debian8-64 fedora22 fedora23 osx1010 ppcle-ubuntu1404 ubuntu1204-64 ubuntu1404-64 ubuntu1604-64 rhel7-s390x aix61-ppc64 smartos16-64 smartos15-64 win10 win2012r2'''),
debian8-64 fedora22 fedora23 osx1010 ubuntu1604-64 rhel7-s390x aix61-ppc64 smartos16-64 smartos15-64 win10 win2012r2'''),
]),
])

Expand Down
2 changes: 0 additions & 2 deletions jenkins/scripts/VersionSelectorScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ def buildExclusions = [
[ /rhel8/, releaseType, lt(18) ],
[ /rhel8/, anyType, lt(14) ],
[ /^ubuntu1804/, anyType, lt(10) ], // probably temporary
[ /^ubuntu1404-32/, anyType, gte(10) ], // 32-bit linux for <10 only
[ /^ubuntu1404-64/, anyType, gte(12) ],
[ /^ubuntu1604-32/, anyType, gte(10) ], // 32-bit linux for <10 only
[ /^ubuntu1604-64/, anyType, gte(16) ],
[ /^ubuntu2004/, anyType, lt(13) ], // Ubuntu 20 doesn't have Python 2
Expand Down
2 changes: 0 additions & 2 deletions tools/build-p-ssh-hosts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ grep -- 'rhel7.*-s390x' hosts/all > hosts/rhel7x-s390x
grep -- 'smartos' hosts/all > hosts/smartos
grep -- 'softlayer' hosts/all > hosts/softlayer
grep -- 'test-' hosts/all > hosts/test
grep -- 'ubuntu1404-ppc64_be' hosts/all > hosts/ubuntu1404-ppc64_be
grep -- 'ubuntu1404-ppc64_le' hosts/all > hosts/ubuntu1404-ppc64_le
grep -- 'zos13' hosts/all > hosts/zos13

echo "Parallel SSH config files updated in ./hosts"

0 comments on commit 1578478

Please sign in to comment.