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.

Sign up for GitHub

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

Jump to bottom

chore: remove references to centos6 #3333

Merged
merged 1 commit into from
May 2, 2023
Merged

chore: remove references to centos6 #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions ansible/roles/baselayout/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@
stat: path="{{ binary_dest }}"
register: has_git

- name: centos6 | remove existing git package
when: "os == 'centos6' and arch != 'arm64'"
yum:
name: "git"
state: absent

- name: install packages
when: not os|startswith("zos") and not os|startswith("macos")
package:
Expand Down Expand Up @@ -161,13 +155,6 @@
- cpp
- c++

- name: centos6 | install devtoolset-2
when: "os == 'centos6'"
yum:
disable_gpg_check: true
name: "devtoolset-2-gcc,devtoolset-2-gcc-c++,devtoolset-2-binutils"
state: present

- name: remove fortune from login shells
when: os|stripversion == 'freebsd'
lineinfile:
Expand Down
29 changes: 0 additions & 29 deletions ansible/roles/baselayout/tasks/partials/repo/centos6.yml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ common_packages: [
# % ansible -m debug -a "var=arch" HOST
# % ansible -m debug -a "var=os" HOST
packages: {
centos6_x64: ['centos-release-scl'], # only available on x86_64, 32-bit is from https://copr.fedorainfracloud.org/coprs/mlampe
centos6: [
'ccache,git2u,gcc-c++,devtoolset-6,sudo', # even need gcc on centos6 so ccache has symlinks
],

# centos-release-scl is required to enable SCLo but we do it manually in
# partials/repo/centos7.yml for arm64
centos7_arm64: [
Expand Down
23 changes: 0 additions & 23 deletions ansible/roles/bootstrap/tasks/partials/centos6.yml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ansible/roles/jenkins-worker/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,6 @@
shell:
cmd: "iconv -f utf8 -t ibm-1047 {{ initscript.dest }} > {{ (initscript.dest | splitext)[0] }}"

- name: centos6 | render sysconfig into place
when: "os == 'centos6'"
template:
src: "{{ role_path }}/templates/centos6.sysconfig.j2"
dest: "/etc/sysconfig/jenkins"
mode: "0644"

# TODO - Should this run on every machine?
- name: copy start.sh to {{ home }}/{{ server_user }}/start.sh
when: os|startswith("macos")
Expand Down
17 changes: 0 additions & 17 deletions ansible/roles/jenkins-worker/tasks/partials/tap2junit/centos6.yml
View file
Open in desktop

This file was deleted.

93 changes: 0 additions & 93 deletions ansible/roles/jenkins-worker/templates/centos6.initd.j2
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ansible/roles/jenkins-worker/templates/centos6.sysconfig.j2
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ansible/roles/jenkins-worker/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

init: {
aix: ['aix72', 'aix73'],
centos6: 'centos6',
debian: 'debian7',
freebsd: 'freebsd',
ibmi: 'ibmi73',
Expand All @@ -23,11 +22,6 @@ jenkins_init: {
src: 'aix.rc2.j2',
mode: '0555'
},
centos6: {
dest: '/etc/init.d/jenkins',
src: 'centos6.initd.j2',
mode: '0755'
},
debian: {
dest: '/etc/init.d/jenkins',
src: 'sysvinit.initd.j2',
Expand Down Expand Up @@ -72,7 +66,6 @@ init_type: "{{ os|match_key(init, raise_error=False)|default(os|stripversion|mat
jenkins: "{{ jenkins_init[init_type] }}"

needs_monit: [
'centos6',
'debian7',
]

Expand Down
2 changes: 0 additions & 2 deletions doc/node-test-commit-matrix.md
View file
Open in desktop
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
- centos6-64-gcc48 (Node < 10)
- centos6-64-gcc6 (Node >= 10)
- centos7-64-gcc48 (Node < 10)
- centos7-64-gcc6 (Node >= 10)
- debian8-64
Expand Down
9 changes: 3 additions & 6 deletions jenkins/scripts/VersionSelectorScript.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,11 @@ def buildExclusions = [
// Machine Label, Build Type, Node Version

// Linux -------------------------------------------------
[ /^centos6/, releaseType, lt(8) ],
[ /^centos6/, anyType, gte(12) ],
[ /^centos[67]-(arm)?(64|32)-gcc48/,anyType, gte(10) ],
[ /^centos[67]-(arm)?(64|32)-gcc6/, anyType, lt(10) ],
[ /^centos[67]-(arm)?(64|32)-gcc6/, anyType, gte(14) ], // 14.x: gcc6 builds stop
[ /^centos7-(arm)?(64|32)-gcc48/,anyType, gte(10) ],
[ /^centos7-(arm)?(64|32)-gcc6/, anyType, lt(10) ],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these < 10 selectors still needed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would have to look further, but if not I still think would be better to address in a different PR as this once is removing refs to centos6.

[ /^centos7-(arm)?(64|32)-gcc6/, anyType, gte(14) ], // 14.x: gcc6 builds stop
[ /^centos7-(arm)?(64)-gcc8/, anyType, lt(14) ], // 14.x: gcc8 builds start
[ /^centos7-(arm)?(64)-gcc8/, anyType, gte(18) ], // 18.x: centos7 builds stop
[ /^centos6-32-gcc6/, releaseType, gte(10) ], // 32-bit linux for <10 only
[ /^centos7-64/, releaseType, lt(12) ],
[ /^centos7-64/, anyType, gte(18) ],
[ /debian8-x86/, anyType, gte(10) ], // 32-bit linux for <10 only
Expand Down
8 changes: 2 additions & 6 deletions jenkins/scripts/select-compiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,7 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
. /opt/rh/devtoolset-8/enable
echo "Compiler set to devtoolset-8"
;;
centos6-64-gcc48 )
. /opt/rh/devtoolset-2/enable
echo "Compiler set to devtoolset-2"
;;
centos[67]-64-gcc6 )
centos7-64-gcc6 )
. /opt/rh/devtoolset-6/enable
echo "Compiler set to devtoolset-6"
;;
Expand Down Expand Up @@ -225,7 +221,7 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
. /opt/rh/devtoolset-8/enable
echo "Compiler set to devtoolset-8"
;;
centos[67]-arm64-gcc6 )
centos7-arm64-gcc6 )
. /opt/rh/devtoolset-6/enable
echo "Compiler set to devtoolset-6"
;;
Expand Down
1 change: 0 additions & 1 deletion tools/build-p-ssh-hosts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ grep -- 'aix61-ppc64_be' hosts/all > hosts/aix61-ppc64_be
grep -- 'arm64_pi3' hosts/all > hosts/arm64_pi3
grep -- 'armv6l_pi1' hosts/all > hosts/armv6l_pi1
grep -- 'armv7l_pi2' hosts/all > hosts/armv7l_pi2
grep -- 'centos6-x64' hosts/all > hosts/centos6-x64
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
Expand Down