From b5c2a57ef784c716674dfd8cbb72897ba0c22dbd Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 23 Oct 2019 12:05:00 +1100 Subject: [PATCH] banish CentOS 5 --- ansible/README.md | 2 - ansible/inventory.yml | 5 - ansible/playbooks/jenkins/worker/create.yml | 2 +- .../tasks/partials/repo/centos5.yml | 18 ---- .../bootstrap/tasks/partials/centos5.yml | 13 --- ansible/roles/java-base/vars/main.yml | 1 - .../tasks/partials/tap2junit/centos5.yml | 17 --- .../jenkins-worker/templates/centos5.initd.j2 | 101 ------------------ ansible/roles/jenkins-worker/vars/main.yml | 7 -- doc/node-test-commit-matrix.md | 2 - jenkins/scripts/VersionSelectorScript.groovy | 1 - 11 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 ansible/roles/baselayout/tasks/partials/repo/centos5.yml delete mode 100644 ansible/roles/bootstrap/tasks/partials/centos5.yml delete mode 100644 ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos5.yml delete mode 100644 ansible/roles/jenkins-worker/templates/centos5.initd.j2 diff --git a/ansible/README.md b/ansible/README.md index aeb571acf..f80846da7 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -242,13 +242,11 @@ Unsorted stuff of things we need to do/think about - [ ] add clang/clang++ symlinks for ccache - [ ] centos7 needs different ccache path - [ ] debian7 needs to update alternative gcc/g++ -- [ ] adding scl stuff on centos5/6 is broken - [ ] 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 -- [ ] centos5 and 6 repositories for rhel\* stuff is broken - [ ] automate more items in initial Raspberry Pi setup (see bottom of setup/raspberry-pi/README.md, some of these can be automated) - [ ] epel-release for centos - required for centos7 on packet.net arm64 diff --git a/ansible/inventory.yml b/ansible/inventory.yml index ba3d7019f..ffbbf2675 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -31,7 +31,6 @@ hosts: - release: - digitalocean: - centos5-x64-1: {ip: 162.243.217.142} centos6-x86-1: {ip: 162.243.248.28} centos7-x64-1: {ip: 138.68.12.105} @@ -57,7 +56,6 @@ hosts: ubuntu1604-armv7l-2: {ip: 212.47.234.107} - softlayer: - centos5-x86-1: {ip: 50.23.85.253} centos6-x64-1: {ip: 169.62.77.228} - linuxonecc: @@ -79,7 +77,6 @@ hosts: msft-ubuntu1404-x64-1: {ip: node-msft-cross-compiler-1.cloudapp.net} - digitalocean: - centos5-x86-1: {ip: 192.241.250.186} debian8-x64-1: {ip: 159.203.103.52} debian9-x64-1: {ip: 138.197.97.208} fedora27-x64-1: {ip: 159.203.117.50} @@ -211,8 +208,6 @@ hosts: ubuntu1804-armv7l-3: {ip: 51.15.218.201} - softlayer: - centos5-x64-1: {ip: 50.23.85.252} - centos5-x64-2: {ip: 173.193.25.109} centos6-x64-1: {ip: 169.61.75.51} centos6-x64-2: {ip: 169.61.75.58} centos7-x64-1: {ip: 50.23.85.250} diff --git a/ansible/playbooks/jenkins/worker/create.yml b/ansible/playbooks/jenkins/worker/create.yml index 7b2b27a8d..ca2a135ec 100644 --- a/ansible/playbooks/jenkins/worker/create.yml +++ b/ansible/playbooks/jenkins/worker/create.yml @@ -106,7 +106,7 @@ - "!test-rackspace-freebsd10-x64-1" tasks: - name: remove node and npm packages - when: not os|startswith("win") and not os|startswith("zos") and os != "centos5" + when: not os|startswith("win") and not os|startswith("zos") package: name: "{{ package }}" state: absent diff --git a/ansible/roles/baselayout/tasks/partials/repo/centos5.yml b/ansible/roles/baselayout/tasks/partials/repo/centos5.yml deleted file mode 100644 index 6c2afbeb3..000000000 --- a/ansible/roles/baselayout/tasks/partials/repo/centos5.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- - -# -# centos5 - the old stuff -# - -- name: add scl repo - yum_repository: - name: slc5-devtoolset - baseurl: http://linuxsoft.cern.ch/cern/devtoolset/ - gpgkey: http://ftp.scientificlinux.org/linux/scientific/5x/{{ ansible_architecture }}/RPM-GPG-KEYs/RPM-GPG-KEY-cern - gpgcheck: yes - description: cern scl repo - -- name: install epel - yum: - name: "http://archives.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm" - state: present diff --git a/ansible/roles/bootstrap/tasks/partials/centos5.yml b/ansible/roles/bootstrap/tasks/partials/centos5.yml deleted file mode 100644 index dc6d7b592..000000000 --- a/ansible/roles/bootstrap/tasks/partials/centos5.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- - -# -# centos 5 -# - -- name: check python version - raw: python -V - register: python_version - -- name: install ansible requirements - raw: yum install -y python-simplejson - when: python_version.stdout|search("2.4") diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 2e52e5a7d..9a1ab7376 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -5,7 +5,6 @@ # packages: { - 'centos5': 'java-1.7.0-openjdk', 'centos': 'java-1.8.0-openjdk-headless', 'debian7': 'openjdk-7-jre-headless', 'debian8': 'oracle-java8-installer', diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos5.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos5.yml deleted file mode 100644 index 7112a9c36..000000000 --- a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos5.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- - -# -# centos5: python2.4 is default -- python 2.6 is available through epel -# - -- name: install required packages - package: name="{{ package }}" state=present - loop_control: - loop_var: package - with_items: - - python26-setuptools - - python26-argparse - -- name: install tap2junit - raw: easy_install tap2junit - diff --git a/ansible/roles/jenkins-worker/templates/centos5.initd.j2 b/ansible/roles/jenkins-worker/templates/centos5.initd.j2 deleted file mode 100644 index 041c23f98..000000000 --- a/ansible/roles/jenkins-worker/templates/centos5.initd.j2 +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/jenkins -# init script for a jenkins slave. -# -# chkconfig: 345 90 60 -# description: jenkins slave -# - -RETVAL=0 - -NAME=`basename "$0"` -LOCK_FILE=/var/lock/$NAME -JAVA=/usr/bin/java -PIDFILE=/var/run/jenkins/$NAME.pid - -JENKINS_SLAVE_USER="iojs" -JENKINS_SLAVE_JAR="/home/{{ server_user }}/slave.jar" -JENKINS_SLAVE_LOG="/home/{{ server_user }}/$NAME.log" -JENKINS_SLAVE_ARGS="-jnlpUrl {{ jenkins_url }}/computer/{{ inventory_hostname }}/slave-agent.jnlp -secret {{ secret }}" -JENKINS_ENV="JOBS={{ ansible_processor_vcpus }} \ - HOME=/home/{{ server_user }} \ - DESTCPU={{ ansible_architecture }} \ - ARCH={{ ansible_architecture }} \ - JOBS={{ jobs_env }} \ - OSTYPE=linux-gnu \ - NODE_TEST_DIR=$HOME/tmp \ - NODE_COMMON_PIPE=/home/iojs/test.pipe" - - -# Source function library. -. /etc/rc.d/init.d/functions - -# Add python/ccache path as well as regular path -JENKINS_PATH="/usr/lib64/ccache:/opt/rh/devtoolset-2/root/usr/bin:$PATH" - -# Replace potentially double colons since they add cwd -JENKINS_PATH="${JENKINS_PATH//::/:}" - -slave_start() { - echo Starting $NAME... - - mkdir `dirname $PIDFILE` > /dev/null 2>&1 || true - chown $JENKINS_SLAVE_USER `dirname $PIDFILE` - - runuser -m -l $JENKINS_SLAVE_USER -c "$JENKINS_ENV PATH=$JENKINS_PATH $JAVA -jar $JENKINS_SLAVE_JAR $JENKINS_SLAVE_ARGS > $JENKINS_SLAVE_LOG 2>&1 &" - pgrep -f -u $JENKINS_SLAVE_USER $JENKINS_SECRET > $PIDFILE - RETVAL=$? - [ $RETVAL -eq 0 ] && touch $LOCK_FILE -} - -slave_stop() { - echo Stopping $NAME... - pid=`cat $PIDFILE` - - killproc -p $PIDFILE - - # Wait until the monitor exits - while (checkpid $pid) - do - usleep 100000 - done - - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE -} - -slave_restart() { - echo Restarting $NAME... - slave_stop - slave_start - - RETVAL=$? - [ $RETVAL -eq 0 ] && touch $LOCK_FILE -} - -slave_status() { - status -p $PIDFILE $NAME - RETVAL=$? -} - -case "$1" in - start) - slave_start - ;; - stop) - slave_stop - ;; - restart) - slave_restart - ;; - status) - slave_status - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -exit $RETVAL diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index 157d994ac..88a408bc7 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -6,7 +6,6 @@ init: { aix: ['aix71', 'aix72'], - centos5: 'centos5', centos6: 'centos6', debian: 'debian7', freebsd: 'freebsd', @@ -24,11 +23,6 @@ jenkins_init: { src: 'aix.rc2.j2', mode: '0555' }, - centos5: { - dest: '/etc/init.d/jenkins', - src: 'centos5.initd.j2', - mode: '0755' - }, centos6: { dest: '/etc/init.d/jenkins', src: 'centos6.initd.j2', @@ -84,7 +78,6 @@ init_type: "{{ os|match_key(init, raise_error=False)|default(os|stripversion|mat jenkins: "{{ jenkins_init[init_type] }}" needs_monit: [ - 'centos5', 'centos6', 'debian7', ] diff --git a/doc/node-test-commit-matrix.md b/doc/node-test-commit-matrix.md index 1e9963fad..798b43ff0 100644 --- a/doc/node-test-commit-matrix.md +++ b/doc/node-test-commit-matrix.md @@ -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 - - centos5-32 (Node < 8) - - centos5-64 (Node < 8) - centos6-64-gcc48 (Node < 10) - centos6-64-gcc6 (Node >= 10) - centos7-64-gcc48 (Node < 10) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 55a33c86f..dd3f35883 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -12,7 +12,6 @@ def buildExclusions = [ // Machine Label, Build Type, Node Version // Linux ------------------------------------------------- - [ /^centos5/, anyType, gte(8) ], [ /^centos6/, releaseType, lt(8) ], [ /^centos6/, anyType, gte(12) ], [ /centos[67]-(arm)?(64|32)-gcc48/, anyType, gte(10) ],