Remove Trusty support from tests repository
Change-Id: I66b5bef5ec55b87902bf25f8bc56dfb0d33a5ff1 Implements: blueprint trusty-removal
This commit is contained in:
parent
04dec8d74a
commit
2249c567c2
|
@ -1,9 +1,9 @@
|
|||
Vagrant.configure(2) do |config|
|
||||
config.vm.box = "ubuntu/trusty64"
|
||||
config.vm.box = "ubuntu/xenial64"
|
||||
config.vm.provision "shell", inline: <<-SHELL
|
||||
sudo su -
|
||||
cd /vagrant
|
||||
apt-get update
|
||||
./run_tests.sh
|
||||
SHELL
|
||||
end
|
||||
end
|
||||
|
|
|
@ -32,7 +32,7 @@ libselinux-python [platform:rpm]
|
|||
# For SSL SNI support
|
||||
python-pyasn1 [platform:dpkg]
|
||||
python-openssl [platform:dpkg]
|
||||
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty]
|
||||
python-ndg-httpsclient [platform:ubuntu]
|
||||
python2-pyasn1 [platform:rpm]
|
||||
pyOpenSSL [platform:rpm]
|
||||
python-ndg_httpsclient [platform:rpm]
|
||||
|
|
|
@ -13,14 +13,6 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# The "command" module is used here instead of "lineinfile" because all we
|
||||
# want to do is uncomment the backports repo if its found.
|
||||
- name: Ensure trusty-backports are available
|
||||
command: "sed -i '/deb.*-backports/s|^#\\s||g' /etc/apt/sources.list"
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
- ansible_distribution_release | lower == 'trusty'
|
||||
|
||||
- name: First ensure apt cache is always refreshed
|
||||
apt:
|
||||
update_cache: true
|
||||
|
|
Loading…
Reference in New Issue