From d4291e2a0a63d002e96ae4f09f52ea778d2a65be Mon Sep 17 00:00:00 2001 From: Mansour <57921115+ncmans@users.noreply.github.com> Date: Tue, 10 Dec 2019 09:15:37 +1100 Subject: ci: remove ubuntu trusty 14.04 from build (#7481) * ci: remove ubuntu trusty 14.04 from build * Update packaging matrix with ubuntu 14.04 changes --- .travis/package_management/configure_deb_lxc_environment.py | 3 --- 1 file changed, 3 deletions(-) (limited to '.travis') diff --git a/.travis/package_management/configure_deb_lxc_environment.py b/.travis/package_management/configure_deb_lxc_environment.py index 4311c03abf..3c8a7689c9 100755 --- a/.travis/package_management/configure_deb_lxc_environment.py +++ b/.travis/package_management/configure_deb_lxc_environment.py @@ -84,9 +84,6 @@ 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/trusty") == 1: - common.run_command_in_host(['sudo', 'rm', 'contrib/debian/control']) - common.run_command_in_host(['sudo', 'cp', 'contrib/debian/control.trusty', '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']) -- cgit v1.2.3