Skip to content

Commit 612dcfe

Browse files
authored
chore: remove references to centos6 (#3333)
We don't have any machines left on this system.
1 parent 014b7bc commit 612dcfe

File tree

13 files changed

+5
-222
lines changed

13 files changed

+5
-222
lines changed

ansible/roles/baselayout/tasks/main.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@
5757
stat: path="{{ binary_dest }}"
5858
register: has_git
5959

60-
- name: centos6 | remove existing git package
61-
when: "os == 'centos6' and arch != 'arm64'"
62-
yum:
63-
name: "git"
64-
state: absent
65-
6660
- name: install packages
6761
when: not os|startswith("zos") and not os|startswith("macos")
6862
package:
@@ -161,13 +155,6 @@
161155
- cpp
162156
- c++
163157

164-
- name: centos6 | install devtoolset-2
165-
when: "os == 'centos6'"
166-
yum:
167-
disable_gpg_check: true
168-
name: "devtoolset-2-gcc,devtoolset-2-gcc-c++,devtoolset-2-binutils"
169-
state: present
170-
171158
- name: remove fortune from login shells
172159
when: os|stripversion == 'freebsd'
173160
lineinfile:

ansible/roles/baselayout/tasks/partials/repo/centos6.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

ansible/roles/baselayout/vars/main.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ common_packages: [
3434
# % ansible -m debug -a "var=arch" HOST
3535
# % ansible -m debug -a "var=os" HOST
3636
packages: {
37-
centos6_x64: ['centos-release-scl'], # only available on x86_64, 32-bit is from https://copr.fedorainfracloud.org/coprs/mlampe
38-
centos6: [
39-
'ccache,git2u,gcc-c++,devtoolset-6,sudo', # even need gcc on centos6 so ccache has symlinks
40-
],
41-
4237
# centos-release-scl is required to enable SCLo but we do it manually in
4338
# partials/repo/centos7.yml for arm64
4439
centos7_arm64: [

ansible/roles/bootstrap/tasks/partials/centos6.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

ansible/roles/jenkins-worker/tasks/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,6 @@
180180
shell:
181181
cmd: "iconv -f utf8 -t ibm-1047 {{ initscript.dest }} > {{ (initscript.dest | splitext)[0] }}"
182182

183-
- name: centos6 | render sysconfig into place
184-
when: "os == 'centos6'"
185-
template:
186-
src: "{{ role_path }}/templates/centos6.sysconfig.j2"
187-
dest: "/etc/sysconfig/jenkins"
188-
mode: "0644"
189-
190183
# TODO - Should this run on every machine?
191184
- name: copy start.sh to {{ home }}/{{ server_user }}/start.sh
192185
when: os|startswith("macos")

ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos6.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

ansible/roles/jenkins-worker/templates/centos6.initd.j2

Lines changed: 0 additions & 93 deletions
This file was deleted.

ansible/roles/jenkins-worker/templates/centos6.sysconfig.j2

Lines changed: 0 additions & 13 deletions
This file was deleted.

ansible/roles/jenkins-worker/vars/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
init: {
88
aix: ['aix72', 'aix73'],
9-
centos6: 'centos6',
109
debian: 'debian7',
1110
freebsd: 'freebsd',
1211
ibmi: 'ibmi73',
@@ -23,11 +22,6 @@ jenkins_init: {
2322
src: 'aix.rc2.j2',
2423
mode: '0555'
2524
},
26-
centos6: {
27-
dest: '/etc/init.d/jenkins',
28-
src: 'centos6.initd.j2',
29-
mode: '0755'
30-
},
3125
debian: {
3226
dest: '/etc/init.d/jenkins',
3327
src: 'sysvinit.initd.j2',
@@ -72,7 +66,6 @@ init_type: "{{ os|match_key(init, raise_error=False)|default(os|stripversion|mat
7266
jenkins: "{{ jenkins_init[init_type] }}"
7367

7468
needs_monit: [
75-
'centos6',
7669
'debian7',
7770
]
7871

doc/node-test-commit-matrix.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
1616
- **node-test-commit-linux**
1717
- alpine-last-latest-x64
1818
- alpine-latest-x64
19-
- centos6-64-gcc48 (Node < 10)
20-
- centos6-64-gcc6 (Node >= 10)
2119
- centos7-64-gcc48 (Node < 10)
2220
- centos7-64-gcc6 (Node >= 10)
2321
- debian8-64

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ def buildExclusions = [
2020
// Machine Label, Build Type, Node Version
2121

2222
// Linux -------------------------------------------------
23-
[ /^centos6/, releaseType, lt(8) ],
24-
[ /^centos6/, anyType, gte(12) ],
25-
[ /^centos[67]-(arm)?(64|32)-gcc48/,anyType, gte(10) ],
26-
[ /^centos[67]-(arm)?(64|32)-gcc6/, anyType, lt(10) ],
27-
[ /^centos[67]-(arm)?(64|32)-gcc6/, anyType, gte(14) ], // 14.x: gcc6 builds stop
23+
[ /^centos7-(arm)?(64|32)-gcc48/,anyType, gte(10) ],
24+
[ /^centos7-(arm)?(64|32)-gcc6/, anyType, lt(10) ],
25+
[ /^centos7-(arm)?(64|32)-gcc6/, anyType, gte(14) ], // 14.x: gcc6 builds stop
2826
[ /^centos7-(arm)?(64)-gcc8/, anyType, lt(14) ], // 14.x: gcc8 builds start
2927
[ /^centos7-(arm)?(64)-gcc8/, anyType, gte(18) ], // 18.x: centos7 builds stop
30-
[ /^centos6-32-gcc6/, releaseType, gte(10) ], // 32-bit linux for <10 only
3128
[ /^centos7-64/, releaseType, lt(12) ],
3229
[ /^centos7-64/, anyType, gte(18) ],
3330
[ /debian8-x86/, anyType, gte(10) ], // 32-bit linux for <10 only

jenkins/scripts/select-compiler.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,7 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
182182
. /opt/rh/devtoolset-8/enable
183183
echo "Compiler set to devtoolset-8"
184184
;;
185-
centos6-64-gcc48 )
186-
. /opt/rh/devtoolset-2/enable
187-
echo "Compiler set to devtoolset-2"
188-
;;
189-
centos[67]-64-gcc6 )
185+
centos7-64-gcc6 )
190186
. /opt/rh/devtoolset-6/enable
191187
echo "Compiler set to devtoolset-6"
192188
;;
@@ -225,7 +221,7 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
225221
. /opt/rh/devtoolset-8/enable
226222
echo "Compiler set to devtoolset-8"
227223
;;
228-
centos[67]-arm64-gcc6 )
224+
centos7-arm64-gcc6 )
229225
. /opt/rh/devtoolset-6/enable
230226
echo "Compiler set to devtoolset-6"
231227
;;

tools/build-p-ssh-hosts.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ grep -- 'aix61-ppc64_be' hosts/all > hosts/aix61-ppc64_be
1818
grep -- 'arm64_pi3' hosts/all > hosts/arm64_pi3
1919
grep -- 'armv6l_pi1' hosts/all > hosts/armv6l_pi1
2020
grep -- 'armv7l_pi2' hosts/all > hosts/armv7l_pi2
21-
grep -- 'centos6-x64' hosts/all > hosts/centos6-x64
2221
grep -- 'centos7-ppc64_le' hosts/all > hosts/centos7-ppc64_le
2322
grep -- 'centos7-ppc64_le' hosts/all > hosts/centos7-ppc64_le
2423
grep -- 'centos7' hosts/all > hosts/centos7

0 commit comments

Comments
 (0)