Skip to content

Commit

Permalink
Drop superfluous mentions of 'CentOS' (#850)
Browse files Browse the repository at this point in the history
We're really targeting RHEL here, so no need to discriminate which
clone. The only remaining mentions in this repo stem from our use of the
CentOS docker images specifically for building RHEL packages.
  • Loading branch information
cottsay committed Feb 12, 2021
1 parent e004c74 commit c9aa579
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ros_buildfarm/sourcerpm_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

def _get_source_tag(
rosdistro_name, pkg_name, pkg_version, os_name, os_code_name):
assert os_name in ['centos', 'fedora', 'rhel']
assert os_name in ['fedora', 'rhel']
return 'rpm/%s-%s_%s' % (
get_os_package_name(rosdistro_name, pkg_name),
pkg_version, os_code_name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
package_manager = 'dnf'
python3_pkgversion = '3'

if os_name in ['centos', 'rhel'] and os_code_name.isnumeric() and int(os_code_name) < 8:
if os_name == 'rhel' and os_code_name.isnumeric() and int(os_code_name) < 8:
package_manager = 'yum'
python3_pkgversion = '36'
}@
# generated from @template_name

@[if os_name in ['centos', 'rhel']]@
@[if os_name in ['rhel']]@
FROM centos:@(os_code_name)

# Enable EPEL on CentOS/RHEL
# Enable EPEL on RHEL
RUN @(package_manager) install -y epel-release
@[else]@
FROM @(os_name):@(os_code_name)
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/release/rpm/mock_config.cfg.em
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ config_opts['macros']['%__cmake3_in_source_build'] = '1'
# Required for running mock in Docker
config_opts['use_nspawn'] = False

@[if os_name in ['centos', 'rhel'] and os_code_name == '7']@
@[if os_name == 'rhel' and os_code_name == '7']@
# Inject g++ 8 into RHEL 7 builds
config_opts['chroot_setup_cmd'] += ' devtoolset-8-gcc-c++ devtoolset-8-make-nonblocking'
config_opts['macros']['%_buildshell'] = '/usr/bin/scl enable devtoolset-8 -- /bin/sh'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
package_manager = 'dnf'
python3_pkgversion = '3'

if os_name in ['centos', 'rhel'] and os_code_name.isnumeric() and int(os_code_name) < 8:
if os_name == 'rhel' and os_code_name.isnumeric() and int(os_code_name) < 8:
package_manager = 'yum'
python3_pkgversion = '36'
}@
# generated from @template_name

@[if os_name in ['centos', 'rhel']]@
@[if os_name in ['rhel']]@
FROM centos:@(os_code_name)

# Enable EPEL on CentOS/RHEL
# Enable EPEL on RHEL
RUN @(package_manager) install -y epel-release
@[else]@
FROM @(os_name):@(os_code_name)
Expand Down

0 comments on commit c9aa579

Please sign in to comment.