mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 06:55:16 +00:00
Code Issues Releases Wiki Activity

[#2410] fedora 35 and 35 support

Browse Source
This commit is contained in:
Wlodek Wencel
2022-05-18 09:22:15 +02:00
committed by Wlodzimierz Wencel
parent 9d1c455520
commit c63b2c2311
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
hammer.py
View File

@@ -49,14 +49,18 @@ SYSTEMS = {
#'30', # EOLed #'30', # EOLed
#'31', # EOLed #'31', # EOLed
'32', # EOLed '32', # EOLed
'33', '33', # EOLed
'34', '34',
'35',
'36'
], ],
'centos': [ 'centos': [
'7', '7',
'8', '8',
], ],
'rhel': ['8'], 'rhel': [
'8'
],
'ubuntu': [ 'ubuntu': [
#'16.04', #'16.04',
'18.04', '18.04',
@@ -66,6 +70,7 @@ SYSTEMS = {
'20.04', '20.04',
'20.10', '20.10',
'21.04', '21.04',
# '22.04',
], ],
'debian': [ 'debian': [
#'8', #'8',
@@ -107,6 +112,8 @@ IMAGE_TEMPLATES = {
'fedora-32-lxc': {'bare': 'isc/lxc-fedora-32', 'kea': 'isc/kea-fedora-32'}, 'fedora-32-lxc': {'bare': 'isc/lxc-fedora-32', 'kea': 'isc/kea-fedora-32'},
'fedora-33-lxc': {'bare': 'isc/lxc-fedora-33', 'kea': 'isc/kea-fedora-33'}, 'fedora-33-lxc': {'bare': 'isc/lxc-fedora-33', 'kea': 'isc/kea-fedora-33'},
'fedora-34-lxc': {'bare': 'isc/lxc-fedora-34', 'kea': 'isc/kea-fedora-34'}, 'fedora-34-lxc': {'bare': 'isc/lxc-fedora-34', 'kea': 'isc/kea-fedora-34'},
'fedora-35-lxc': {'bare': 'isc/lxc-fedora-35', 'kea': 'isc/kea-fedora-35'},
'fedora-36-lxc': {'bare': 'isc/lxc-fedora-36', 'kea': 'isc/kea-fedora-36'},
# centos # centos
'centos-7-lxc': {'bare': 'isc/lxc-centos-7', 'kea': 'isc/kea-centos-7'}, 'centos-7-lxc': {'bare': 'isc/lxc-centos-7', 'kea': 'isc/kea-centos-7'},
@@ -1446,9 +1453,11 @@ def prepare_system_local(features, check_times):
packages.extend(['mariadb', 'mariadb-server', 'mariadb-connector-c-devel']) packages.extend(['mariadb', 'mariadb-server', 'mariadb-connector-c-devel'])
if 'pgsql' in features: if 'pgsql' in features:
packages.extend(['postgresql-devel', 'postgresql-server'])
if int(revision) >= 30: if int(revision) >= 30:
packages.extend(['postgresql-server-devel']) packages.extend(['postgresql-server-devel'])
if int(revision) <= 34:
packages.extend(['postgresql-devel'])
packages.extend(['postgresql-server'])
if 'radius' in features: if 'radius' in features:
packages.extend(['freeradius', 'git']) packages.extend(['freeradius', 'git'])
@@ -1460,7 +1469,7 @@ def prepare_system_local(features, check_times):
packages.extend(['ccache']) packages.extend(['ccache'])
if 'netconf' in features: if 'netconf' in features:
if int(revision) <= 33: if int(revision) <= 33 or int(revision) >= 35:
packages.extend(['cmake', 'pcre-devel']) packages.extend(['cmake', 'pcre-devel'])
deferred_functions.extend([ deferred_functions.extend([
_install_libyang_from_sources, _install_libyang_from_sources,
@@ -1470,6 +1479,8 @@ def prepare_system_local(features, check_times):
packages.extend(['cmake', 'libyang', 'libyang-devel', 'libyang-cpp', 'libyang-cpp-devel']) packages.extend(['cmake', 'libyang', 'libyang-devel', 'libyang-cpp', 'libyang-cpp-devel'])
deferred_functions.append(_install_sysrepo_from_sources) deferred_functions.append(_install_sysrepo_from_sources)
install_pkgs(packages, timeout=300, env=env, check_times=check_times) install_pkgs(packages, timeout=300, env=env, check_times=check_times)
if 'unittest' in features: if 'unittest' in features:
@@ -2109,6 +2120,10 @@ def _build_rpm(system, revision, features, tarball_path, env, check_times, dry_r
frc_version = 'isc20210415094816.fc33' frc_version = 'isc20210415094816.fc33'
elif system == 'fedora' and revision == '34': elif system == 'fedora' and revision == '34':
frc_version = 'isc20210528132302.fc34' frc_version = 'isc20210528132302.fc34'
elif system == 'fedora' and revision == '35':
frc_version = 'isc20220516091026.fc35'
elif system == 'fedora' and revision == '36':
frc_version = 'isc20220516091651.fc36'
elif system == 'centos' and revision == '7': elif system == 'centos' and revision == '7':
frc_version = 'isc20200318122047.el7' frc_version = 'isc20200318122047.el7'
elif system in ['centos', 'rhel'] and revision == '8': elif system in ['centos', 'rhel'] and revision == '8':