Skip to content

Commit

Permalink
Depreacated Ubuntu 16.04, as it is EOL in 2 months (and is broken in …
Browse files Browse the repository at this point in the history
…this build)
  • Loading branch information
gclough committed Feb 10, 2021
1 parent 727453b commit bd1b932
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:

env:
matrix:
- IMAGE_NAME="ubuntu:16.04-builded"
## DISABLED ## - IMAGE_NAME="ubuntu:16.04-builded"
- IMAGE_NAME="debian:8-builded"
- IMAGE_NAME="debian:9-builded"
- IMAGE_NAME="centos:7-builded"
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ Including an example of how to use your role:

| Distribution / PostgreSQL | 9.5 | 9.6 | 10 | 11 | 12 | 13 |
| ------------------------- |:---:|:---:|:--:|:--:|:--:|:--:|
| Ubuntu 14.04 | :no_entry: | :no_entry: | :no_entry: | :no_entry: | :no_entry: |:no_entry: |
| Ubuntu 16.04 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:no_entry: |
| Debian 8.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:no_entry: |
| Debian 9.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:no_entry: |
| CentOS 7.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:no_entry: |
Expand Down
33 changes: 18 additions & 15 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@ Vagrant.configure('2') do |config|
config.ssh.insert_key = false
config.ssh.private_key_path = '~/.vagrant.d/insecure_private_key'

config.vm.define 'ubuntu16.local' do |machine|

machine.vm.box = "bento/ubuntu-16.04"
machine.vm.network :private_network, ip: '192.168.88.10'
machine.vm.hostname = 'ubuntu16.local'

machine.vm.provision 'ansible' do |ansible|
ansible.playbook = 'tests/playbook.yml'
ansible.verbose = "vvv"
ansible.become = true
ansible.inventory_path = 'vagrant-inventory'
ansible.host_key_checking = false
end

end
#
# DISABLED
#
# config.vm.define 'ubuntu16.local' do |machine|
#
# machine.vm.box = "bento/ubuntu-16.04"
# machine.vm.network :private_network, ip: '192.168.88.10'
# machine.vm.hostname = 'ubuntu16.local'
#
# machine.vm.provision 'ansible' do |ansible|
# ansible.playbook = 'tests/playbook.yml'
# ansible.verbose = "vvv"
# ansible.become = true
# ansible.inventory_path = 'vagrant-inventory'
# ansible.host_key_checking = false
# end
#
# end

config.vm.define 'jessie64.local' do |machine|

Expand Down
11 changes: 6 additions & 5 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ galaxy_info:
versions:
- jessie
- stretch
- name: Ubuntu
versions:
- xenial
- bionic

- name: EL
versions:
- 6
- 7
#
# DISABLED
#
# - name: Ubuntu
# versions:
# - xenial
# - bionic
# - name: Fedora
# versions:
# - 27
Expand All @@ -35,9 +36,9 @@ galaxy_info:
- sql
- postgis
- debian
- ubuntu
- centos
- redhat
- fedora
- ubuntu

dependencies: []
18 changes: 0 additions & 18 deletions tests/Dockerfile-ubuntu14.04

This file was deleted.

2 changes: 1 addition & 1 deletion vagrant-inventory
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[anxs]
ubuntu16.local ansible_ssh_host=192.168.88.10 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
## DISABLED ## ubuntu16.local ansible_ssh_host=192.168.88.10 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
jessie64.local ansible_ssh_host=192.168.88.20 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
wheezy64.local ansible_ssh_host=192.168.88.21 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
centos7.local ansible_ssh_host=192.168.88.31 ansible_ssh_port=22 ansible_ssh_user=vagrant ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
Expand Down

0 comments on commit bd1b932

Please sign in to comment.