Skip to content

Commit

Permalink
Merge pull request #556 from ANXS/development
Browse files Browse the repository at this point in the history
Revival commit - PG 14 & 15 on ub22.04, deb11, rocky8
  • Loading branch information
MrMegaNova authored Dec 11, 2023
2 parents 495eb6b + 472fb6f commit d1e147e
Show file tree
Hide file tree
Showing 33 changed files with 212 additions and 188 deletions.
48 changes: 21 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,35 @@ defaults:

jobs:

# lint:
# name: Lint
# runs-on: ubuntu-latest
# steps:
# - name: Check out the codebase.
# uses: actions/checkout@v2
# with:
# path: 'postgresql'
#
# - name: Set up Python 3.
# uses: actions/setup-python@v2
# with:
# python-version: '3.x'
#
# - name: Install test dependencies.
# run: pip3 install yamllint
#
# - name: Lint code.
# run: |
# yamllint .
lint:
name: Yamllint
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v4
with:
path: 'postgresql'

- name: Set up Python 3.
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install yamllint

- name: Lint code.
run: |
yamllint .
molecule:
name: Molecule
runs-on: ubuntu-latest
strategy:
matrix:
include:
- distro: centos8
- distro: debian9
- distro: debian10
- distro: rockylinux8
- distro: debian11
- distro: fedora37
- distro: ubuntu1604
- distro: ubuntu1804
- distro: ubuntu2004
- distro: ubuntu2204

steps:
Expand Down
35 changes: 35 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---

yaml-files:
- '*.yaml'
- '*.yml'
- '.yamllint'

rules:
braces: disable
brackets: disable
colons: disable
commas: disable
comments: disable
comments-indentation: disable
document-end: disable
document-start: disable
empty-lines:
max: 1
max-start: 1
max-end: 1
empty-values:
forbid-in-block-mappings: true
forbid-in-flow-mappings: true
hyphens:
max-spaces-after: 1
indentation: disable
key-duplicates: disable
key-ordering: disable
line-length: disable
new-line-at-end-of-file: enable
new-lines: disable
octal-values: disable
quoted-strings: disable
trailing-spaces: enable
truthy: disable
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ An example how to include this role as a task:
| Ubuntu 18.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| Ubuntu 20.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :grey_question: |
| Ubuntu 22.04.x | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:grey_question: | :white_check_mark: |
| Rockylinux 9.x | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:white_check_mark: | :white_check_mark: |
| Fedora 37 | :grey_question: | :grey_question: | :grey_question: | :grey_question: |:grey_question: | :grey_question: |

- :white_check_mark: - tested, works fine
Expand Down Expand Up @@ -179,6 +180,7 @@ Maintainers:
- [Greg Clough](https://github.com/gclough)
- [Magnus Lübeck](https://github.com/maglub)
- [Leo C.](https://github.com/MrMegaNova)
- [Laurent Lavaud](https://github.com/fidelio33b)

Top Contributors:
- [David Farrington](https://github.com/farridav)
Expand Down
78 changes: 4 additions & 74 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,11 @@ Vagrant.configure('2') do |config|
config.ssh.insert_key = false
config.ssh.private_key_path = '~/.vagrant.d/insecure_private_key'

#
# 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 'jammy64.local' do |machine|

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

machine.vm.box = "debian/jessie64"
machine.vm.network :private_network, ip: '192.168.88.20'
machine.vm.hostname = 'jessie64.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 'wheezy64.local' do |machine|

machine.vm.box = "debian/wheezy64"
machine.vm.network :private_network, ip: '192.168.88.21'
machine.vm.hostname = 'wheezy64.local'
machine.vm.box = "ubuntu/jammy64"
machine.vm.network :private_network, ip: '192.168.88.22'
machine.vm.hostname = 'jammy64.local'

machine.vm.provision 'ansible' do |ansible|
ansible.playbook = 'tests/playbook.yml'
Expand All @@ -58,39 +23,4 @@ Vagrant.configure('2') do |config|

end

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

machine.vm.box = "centos/7"
machine.vm.network :private_network, ip: '192.168.88.30'
machine.vm.hostname = 'centos7.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

##
## Fedora is disabled, as the build fails
##
## config.vm.define 'fedora27.local' do |machine|
##
## machine.vm.box = "fedora/27-cloud-base"
## machine.vm.network :private_network, ip: '192.168.88.40'
## machine.vm.hostname = 'fedora27.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

end
Loading

0 comments on commit d1e147e

Please sign in to comment.