Add missing override for Ubuntu eoan (#8547)
James Mills committed
Apr 1, 2020 at 10:24 UTC
14b4388f71010ac00a1c6b82045c6922470c143c
1 file changed
+10
-4
.travis/package_management/configure_deb_lxc_environment.py
+10
-4
@@ -80,17 +80,23 @@ tar_file="%s/netdata-%s.tar.gz" % (os.path.dirname(dest_archive), friendly_versi
80
print("5. I will be building version '%s' of netdata." % os.environ['BUILD_VERSION'])
81
dest_archive="%s/netdata-%s.tar.gz" % (build_path, friendly_version)
82
83
+### Debian
84
if str(os.environ["BUILD_STRING"]).count("debian/jessie") == 1:
85
print("5.1 We are building for Jessie, adjusting control file")
86
common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control'])
87
common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.jessie', 'contrib/debian/control'])
87
-if str(os.environ["BUILD_STRING"]).count("ubuntu/xenial") == 1:
88
- common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control'])
89
- common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.xenial', 'contrib/debian/control'])
88
if str(os.environ["BUILD_STRING"]).count("debian/buster") == 1:
89
+ print("5.1 We are building for Buster, adjusting control file")
90
common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control'])
91
common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.buster', 'contrib/debian/control'])
93
-if str(os.environ["BUILD_STRING"]).count("debian/eoan") == 1:
92
+
93
+### Ubuntu
94
+if str(os.environ["BUILD_STRING"]).count("ubuntu/xenial") == 1:
95
+ print("5.1 We are building for Xenial, adjusting control file")
96
+ common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control'])
97
+ common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.xenial', 'contrib/debian/control'])
98
+if str(os.environ["BUILD_STRING"]).count("ubuntu/eoan") == 1:
99
+ print("5.1 We are building for Eoan, adjusting control file")
100
common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control'])
101
common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.eoan', 'contrib/debian/control'])
102