Skip to content

Commit 276dbb4

Browse files
committed
Fix: INSTALLATION fix centos 6.7 & disable fedora 20 as dnf is currently broken
1 parent c7e4d1f commit 276dbb4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,8 @@ def _fix_centos_7_epel_no_https():
461461
with open(epel, 'r') as f:
462462
lines = f.readlines()
463463
# sed 'mirrorlist=https:' into 'mirrorlist=http:'
464-
new_file = ''.join([line.replace('metalink=https:', 'metalink=http:') for line in lines])
464+
# and mirrorlist=https: into mirrorlist=https: (centos 6)
465+
new_file = ''.join([line.replace('metalink=https:', 'metalink=http:').replace('mirrorlist=https:', 'mirrorlist=http:') for line in lines])
465466
with open(epel, 'w') as f:
466467
f.write(new_file)
467468

@@ -472,7 +473,7 @@ def _fix_centos_7_epel_no_https():
472473
'centos': [
473474
{'package_name': 'libgomp'}, # monotonic clock
474475
{'package_name': 'nss', 'only_for': ['6.6', '6.7', '7.0', '7.1'], 'force_update': True}, # force update of nss for connect to up to date HTTPS, especialy epel
475-
{'package_name': 'epel-release', 'only_for': ['7.0', '7.1'], 'post_fix': _fix_centos_7_epel_no_https}, # need for leveldb
476+
{'package_name': 'epel-release', 'only_for': ['6.7', '7.0', '7.1'], 'post_fix': _fix_centos_7_epel_no_https}, # need for leveldb, and post_fix is need for 6.7
476477
{'package_name': 'leveldb', 'only_for': ['7.0', '7.1']}, # sqlite on old centos is broken
477478
],
478479
}

test/docker-files/docker-file-FEDORA-installation-fedora-30.txt renamed to test/docker-files/docker-file-DISABLED-FEDORA-installation-fedora-30.txt

+4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ FROM fedora:30
22
MAINTAINER Jean Gabes <[email protected]>
33

44
ADD test/docker-helper/ /
5+
6+
#TODO: dnf segfault currently
57
RUN /dnf_install python2
68

79

10+
11+
812
ADD . /root/opsbro-oss
913

1014
ENTRYPOINT test/test_one_linux_installation.sh && test/assert_group.sh "fedora"

0 commit comments

Comments
 (0)