diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2020-04-01 10:24:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 10:24:32 +1000 |
| commit | 14b4388f71010ac00a1c6b82045c6922470c143c (patch) | |
| tree | 88e889de2453c4ba855b2b32b070085fc0e429e1 /.travis | |
| parent | a12d4e56d7db6bcb0f84a26b930ab745ffdd427a (diff) | |
Add missing override for Ubuntu eoan (#8547)
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/package_management/configure_deb_lxc_environment.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.travis/package_management/configure_deb_lxc_environment.py b/.travis/package_management/configure_deb_lxc_environment.py index 8c304bd88d..7606e292e2 100755 --- a/.travis/package_management/configure_deb_lxc_environment.py +++ b/.travis/package_management/configure_deb_lxc_environment.py @@ -80,17 +80,23 @@ tar_file="%s/netdata-%s.tar.gz" % (os.path.dirname(dest_archive), friendly_versi print("5. I will be building version '%s' of netdata." % os.environ['BUILD_VERSION']) dest_archive="%s/netdata-%s.tar.gz" % (build_path, friendly_version) +### Debian if str(os.environ["BUILD_STRING"]).count("debian/jessie") == 1: print("5.1 We are building for Jessie, adjusting control file") common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control']) common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.jessie', 'contrib/debian/control']) -if str(os.environ["BUILD_STRING"]).count("ubuntu/xenial") == 1: - common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control']) - common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.xenial', 'contrib/debian/control']) if str(os.environ["BUILD_STRING"]).count("debian/buster") == 1: + print("5.1 We are building for Buster, adjusting control file") common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control']) common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.buster', 'contrib/debian/control']) -if str(os.environ["BUILD_STRING"]).count("debian/eoan") == 1: + +### Ubuntu +if str(os.environ["BUILD_STRING"]).count("ubuntu/xenial") == 1: + print("5.1 We are building for Xenial, adjusting control file") + common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control']) + common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.xenial', 'contrib/debian/control']) +if str(os.environ["BUILD_STRING"]).count("ubuntu/eoan") == 1: + print("5.1 We are building for Eoan, adjusting control file") common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control']) common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.eoan', 'contrib/debian/control']) |