Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ansible,jenkins: remove CentOS 7 #3981

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,15 +255,12 @@ Unsorted stuff of things we need to do/think about
- [ ] move all service-related stuff to handlers
- [ ] find a nicer way of adding proxyhosts to iptables
- [ ] add clang/clang++ symlinks for ccache
- [ ] centos7 needs different ccache path
- [ ] debian7 needs to update alternative gcc/g++
- [ ] verify that /usr/local/bin works as ccache install path
- [x] remove subversion since v8 tests uses git nowadays
- [ ] assign 192/256mb ram to the jenkins instances that requires it:
- aix
- TBD
- [ ] epel-release for centos - required for centos7 on packet.net arm64
before ccache can be installed
- [x] make .ssh/config and .ssh/id_rsa for release machines, adding config
for `node-www` and record host key for node-www
- [ ] add explicit ARCH and DESTCPU for release machines (RV: I'm adding
Expand Down
2 changes: 0 additions & 2 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ hosts:
aix72-ppc64_be-1:
ip: 140.211.9.77
server_jobs: 6
centos7-arm64-1: {ip: 140.211.169.7, server_jobs: 2, user: centos}
rhel8-arm64-1:
ip: 140.211.169.58
server_jobs: 2
Expand Down Expand Up @@ -301,7 +300,6 @@ hosts:
server_jobs: 32

- rackspace:
centos7-x64-1: {ip: 119.9.27.82}
debian10-x64-1: {ip: 104.239.140.184}
debian11-x64-1: {ip: 23.253.109.216, swap_file_size_mb: 4096}
debian12-x64-1: {ip: 104.130.124.194, swap_file_size_mb: 4096}
Expand Down
15 changes: 1 addition & 14 deletions ansible/roles/baselayout/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

- name: install packages
when: not os|startswith("zos") and not os|startswith("macos")
package:
package:
name: "{{ package }}"
state: present
# Package manager mapping in ansible/roles/package-upgrade/vars/main.yml.
Expand Down Expand Up @@ -88,19 +88,6 @@
- "{{ packages[os|stripversion]|default('[]') }}"
- "{{ common_packages|default('[]') }}"

- name: centos7_ppc64 | update package alternatives
when: os == "centos7" and arch == "ppc64"
alternatives:
link: /usr/local/bin/{{ cmake }}
name: "{{ cmake }}"
path: /usr/bin/{{ cmake }}3
loop_control:
loop_var: cmake
with_items:
- cmake
- cpack
- ctest

- name: ubuntu1604 | update package alternatives
when: os == "ubuntu1604"
alternatives: link=/usr/bin/{{ gcc }} name={{ gcc }} path=/usr/bin/{{ gcc }}-5
Expand Down
65 changes: 0 additions & 65 deletions ansible/roles/baselayout/tasks/partials/repo/centos7.yml

This file was deleted.

14 changes: 1 addition & 13 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@ common_packages: [
# % ansible -m debug -a "var=arch" HOST
# % ansible -m debug -a "var=os" HOST
packages: {
# centos-release-scl is required to enable SCLo but we do it manually in
# partials/repo/centos7.yml for arm64
centos7_arm64: [
'git,python3', # git2u not available for aarch64 (yet)
],
centos7_x64: ['devtoolset-6-libatomic-devel,git222,centos-release-scl,python3'],
centos7_ppc64: ['cmake3,glib2-devel,git,python3'],

centos7: [
'bzip2-devel,openssl-devel,ccache,gcc-c++,sudo,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',
],

aix: [
'bash,cmake,coreutils,curl,gcc-c++,tar,unzip,git,make,sudo,python-setuptools,python3.9',
],
Expand Down Expand Up @@ -145,7 +133,7 @@ packages: {
# Default gcc/g++ package is 7.
ubuntu1804: [
'gcc-6,g++-6,gcc-8,g++-8,python3.8',
],
],

# Default gcc/g++ package is 11.
ubuntu2204: [
Expand Down
16 changes: 0 additions & 16 deletions ansible/roles/build-test-v8/tasks/partials/centos7.yml

This file was deleted.

1 change: 0 additions & 1 deletion ansible/roles/gn/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---

compiler: {
'centos7': '. /opt/rh/devtoolset-8/enable',
'rhel7': '. /opt/rh/devtoolset-8/enable',
'rhel8': '. /opt/rh/gcc-toolset-11/enable'
}
Expand Down
3 changes: 1 addition & 2 deletions ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ packages: {
java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default(omit) }}"

# Add os_arch combinations here that should install and use AdoptOpenJDK
# binaries. Override any variables in the dictionary.
# binaries. Override any variables in the dictionary.
# e.g. on AIX ansible_architecture is 'chrp' on some of our hosts so we
# override arch to be on the safe side.
adoptopenjdk: {
aix72_ppc64: { arch: ppc64 },
aix73_ppc64: { arch: ppc64 },
centos7_ppc64: {}
}

adoptopenjdk_arch: "{{ adoptopenjdk[os+'_'+arch].arch | default(ansible_architecture) }}"
Expand Down
18 changes: 0 additions & 18 deletions ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos7.yml

This file was deleted.

2 changes: 1 addition & 1 deletion ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ init: {
freebsd: 'freebsd',
ibmi: 'ibmi74',
macos: 'macos',
systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
systemd: ['debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
svc: 'smartos',
zos_start: 'zos'
}
Expand Down
7 changes: 2 additions & 5 deletions doc/node-test-commit-matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
- **node-test-commit-linux**
- alpine-last-latest-x64
- alpine-latest-x64
- centos7-64-gcc48 (Node < 10)
- centos7-64-gcc6 (Node >= 10)
- debian8-64
- debian8-x86 (Node < 10)
- debian9-64
Expand All @@ -30,7 +28,8 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
- osx1010 (Node < 11)
- osx1011
- **node-test-commit-plinux**
- centos7-ppcle (Node >= 12)
- rhel8-ppc64le
- rhel9-ppc64le
- **node-test-commit-smartos**
- smartos18-64 (Node >= 12)
- **node-test-commit-windows-fanned**
Expand Down Expand Up @@ -60,8 +59,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
- ubuntu1604_sharedlibs_zlib_x64
1. `CONFIG_FLAGS="$CONFIG_FLAGS --shared-zlib --shared-zlib-includes=${ZLIB12DIR}/include/ --shared-zlib-libpath=${ZLIB12DIR}/lib/" make run-ci -j $JOBS` (ZLIB12DIR points to a pre-build of zlib 1.2)
- **node-test-commit-arm**
- centos7-arm64-gcc48 (Node < 10)
- centos7-arm64-gcc6 (Node >= 10)
- debian7-docker-armv7 (Node < 10)
- debian8-docker-armv7 (Node < 12)
- debian9-docker-armv7 (Node >= 10)
Expand Down
7 changes: 0 additions & 7 deletions jenkins/scripts/VersionSelectorScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,13 @@ def buildExclusions = [
// Machine Label, Build Type, Node Version

// Linux -------------------------------------------------
[ /^centos7-(arm)?64-gcc48/, anyType, gte(18) ],
[ /^centos7-(arm)?64-gcc6/, anyType, gte(18) ], // 14.x: gcc6 builds stop
[ /^centos7-(arm)?64-gcc8/, anyType, gte(18) ], // 18.x: centos7 builds stop
[ /^centos7-64/, anyType, gte(18) ],
[ /debian10/, anyType, gte(21) ],
[ /debian11/, anyType, gte(23) ],
[ /alpine-last-latest/, anyType, gte(22) ], // Alpine 3.18. Bug in GCC 12.2.
[ /rhel7/, anyType, gte(18) ],
[ /^ubuntu1604-32/, anyType, gte(18) ], // 32-bit linux for <10 only
[ /^ubuntu1604-64/, anyType, gte(18) ],

// Linux PPC LE ------------------------------------------
[ /^centos7-ppcle/, anyType, gte(18) ],

// ARM --------------------------------------------------
[ /^ubuntu1804-arm64/, anyType, gte(20) ], // 20.x: gcc8 builds stop
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-4.9/, anyType, gte(18) ],
Expand Down
38 changes: 0 additions & 38 deletions jenkins/scripts/select-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,28 +126,6 @@ if [ "$SELECT_ARCH" = "PPC64LE" ]; then

echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on ppc64le"

case $NODE_NAME in
*centos7* )
if [ "$NODEJS_MAJOR_VERSION" -gt "13" ]; then
# Setup devtoolset-8, sets LD_LIBRARY_PATH, PATH, etc.
. /opt/rh/devtoolset-8/enable
export CC="ccache ppc64le-redhat-linux-gcc"
export CXX="ccache ppc64le-redhat-linux-g++"
export LINK="ppc64le-redhat-linux-g++"
echo "Compiler set to devtoolset-8"
return
elif [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
# Setup devtoolset-6, sets LD_LIBRARY_PATH, PATH, etc.
. /opt/rh/devtoolset-6/enable
export CC="ccache ppc64le-redhat-linux-gcc"
export CXX="ccache ppc64le-redhat-linux-g++"
export LINK="ppc64le-redhat-linux-g++"
echo "Compiler set to devtoolset-6"
return
fi
;;
esac

elif [ "$SELECT_ARCH" = "S390X" ]; then

# Set default
Expand Down Expand Up @@ -231,14 +209,6 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on x64"

case $nodes in
centos7-64-gcc8 )
. /opt/rh/devtoolset-8/enable
echo "Compiler set to devtoolset-8"
;;
centos7-64-gcc6 )
. /opt/rh/devtoolset-6/enable
echo "Compiler set to devtoolset-6"
;;
*ubuntu1804*64|*ubuntu1604-*64|benchmark )
if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then
export CC="ccache gcc-8"
Expand All @@ -260,14 +230,6 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then


case $nodes in
centos7-arm64-gcc8 )
. /opt/rh/devtoolset-8/enable
echo "Compiler set to devtoolset-8"
;;
centos7-arm64-gcc6 )
. /opt/rh/devtoolset-6/enable
echo "Compiler set to devtoolset-6"
;;
*ubuntu1804* )
if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then
export CC="ccache gcc-8"
Expand Down
3 changes: 0 additions & 3 deletions tools/build-p-ssh-hosts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ egrep '^Host .*-.*-.*-.*' ~/.ssh/config | sed -e 's/^Host //' -e 's/ .*//' > hos
# Add aliases for groups of hosts. Feel free to add more aliases as useful.
grep -- '-arm' hosts/all > hosts/arm
grep -- 'aix61-ppc64_be' hosts/all > hosts/aix61-ppc64_be
grep -- 'centos7-ppc64_le' hosts/all > hosts/centos7-ppc64_le
grep -- 'centos7-ppc64_le' hosts/all > hosts/centos7-ppc64_le
grep -- 'centos7' hosts/all > hosts/centos7
grep -- 'digitalocean' hosts/all > hosts/digitalocean
grep -- 'infra-' hosts/all > hosts/infra
grep -- 'joyent' hosts/all > hosts/joyent
Expand Down
Loading