Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4c84df77e | ||
|
|
cd6eb0be16 | ||
|
|
a0fdd48ebb | ||
|
|
1f3cfccc0d | ||
|
|
bf5b4d6fd7 | ||
|
|
e546fc3476 | ||
|
|
4975410ca9 | ||
|
|
76e3e3983d | ||
|
|
3a27978204 | ||
|
|
89e4a34d3d | ||
|
|
934e8ff250 | ||
|
|
7ca61f3fbb |
68
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
68
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Create a report to help us improve
|
||||||
|
title: '[BUG] '
|
||||||
|
labels: 'bug'
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Notes:
|
||||||
|
1. Only post _bug reports_ here.
|
||||||
|
2. Use the appropriate template for _feature requests_.
|
||||||
|
3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Your setup
|
||||||
|
### Formula commit hash / release tag
|
||||||
|
<!-- Please specify the formula's commit hash and/or release tag that you are using. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Versions reports (master & minion)
|
||||||
|
<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Pillar / config used
|
||||||
|
<!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Bug details
|
||||||
|
### Describe the bug
|
||||||
|
<!-- A clear and concise description of what the bug is. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Steps to reproduce the bug
|
||||||
|
<!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
|
||||||
|
<!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
|
||||||
|
<!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Expected behaviour
|
||||||
|
<!-- A clear and concise description of what you expected to happen. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Attempts to fix the bug
|
||||||
|
<!-- Please mention any attempts you have made to fix the bug and what the results were. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Additional context
|
||||||
|
<!-- Add any other context about the problem here. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Meta: How can this template be improved?
|
||||||
|
<!-- Feel free to suggest how this template can be improved. -->
|
||||||
|
|
||||||
|
|
||||||
42
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
42
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
---
|
||||||
|
name: Feature request
|
||||||
|
about: Suggest an idea for this project
|
||||||
|
title: '[FEATURE] '
|
||||||
|
labels: 'enhancement'
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Notes:
|
||||||
|
1. Only post _feature requests_ here.
|
||||||
|
2. Use the appropriate template for _bug reports_.
|
||||||
|
3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Is your feature request related to a problem?
|
||||||
|
<!-- A clear and concise description of what the problem is. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Describe the solution you'd like
|
||||||
|
<!-- A clear and concise description of what you want to happen. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Describe alternatives you've considered
|
||||||
|
<!-- Describe any alternative solutions or features you've considered. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Additional context
|
||||||
|
<!-- Add any other context about the feature request here. -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Meta: How can this template be improved?
|
||||||
|
<!-- Feel free to suggest how this template can be improved. -->
|
||||||
|
|
||||||
|
|
||||||
10
.rubocop.yml
Normal file
10
.rubocop.yml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# vim: ft=yaml
|
||||||
|
---
|
||||||
|
# General overrides used across formulas in the org
|
||||||
|
Metrics/LineLength:
|
||||||
|
# Increase from default of `80`
|
||||||
|
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
||||||
|
Max: 88
|
||||||
|
|
||||||
|
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
|
||||||
13
.salt-lint
Normal file
13
.salt-lint
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# vim: ft=yaml
|
||||||
|
---
|
||||||
|
exclude_paths: []
|
||||||
|
skip_list:
|
||||||
|
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
|
||||||
|
- 205 # Use ".sls" as a Salt State file extension
|
||||||
|
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
|
||||||
|
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
|
||||||
|
- 207 # File modes should always be encapsulated in quotation marks
|
||||||
|
- 208 # File modes should always contain a leading zero
|
||||||
|
tags: []
|
||||||
|
verbosity: 1
|
||||||
113
.travis.yml
113
.travis.yml
@@ -1,60 +1,43 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vim: ft=yaml
|
# vim: ft=yaml
|
||||||
---
|
---
|
||||||
|
## Machine config
|
||||||
dist: bionic
|
dist: bionic
|
||||||
stages:
|
|
||||||
- test
|
|
||||||
- lint
|
|
||||||
- name: release
|
|
||||||
if: branch = master AND type != pull_request
|
|
||||||
|
|
||||||
sudo: required
|
sudo: required
|
||||||
cache: bundler
|
|
||||||
language: ruby
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
# Make sure the instances listed below match up with
|
## Language and cache config
|
||||||
# the `platforms` defined in `kitchen.yml`
|
language: ruby
|
||||||
env:
|
cache: bundler
|
||||||
matrix:
|
|
||||||
- INSTANCE: default-debian-10-develop-py3
|
|
||||||
# - INSTANCE: default-ubuntu-1804-develop-py3
|
|
||||||
# - INSTANCE: default-centos-7-develop-py3
|
|
||||||
# - INSTANCE: default-fedora-30-develop-py3
|
|
||||||
# - INSTANCE: default-opensuse-leap-15-develop-py3
|
|
||||||
# - INSTANCE: default-amazonlinux-2-develop-py2
|
|
||||||
# - INSTANCE: default-debian-9-2019-2-py3
|
|
||||||
# - INSTANCE: default-ubuntu-1804-2019-2-py3
|
|
||||||
- INSTANCE: default-centos-7-2019-2-py3
|
|
||||||
- INSTANCE: default-fedora-30-2019-2-py3
|
|
||||||
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
|
|
||||||
# - INSTANCE: default-amazonlinux-2-2019-2-py2
|
|
||||||
# - INSTANCE: default-debian-9-2018-3-py2
|
|
||||||
- INSTANCE: default-ubuntu-1604-2018-3-py2
|
|
||||||
# - INSTANCE: default-centos-7-2018-3-py2
|
|
||||||
# - INSTANCE: default-fedora-29-2018-3-py2
|
|
||||||
- INSTANCE: default-opensuse-leap-15-2018-3-py2
|
|
||||||
# - INSTANCE: default-amazonlinux-2-2018-3-py2
|
|
||||||
# - INSTANCE: default-debian-8-2017-7-py2
|
|
||||||
# - INSTANCE: default-ubuntu-1604-2017-7-py2
|
|
||||||
- INSTANCE: default-centos-6-2017-7-py2
|
|
||||||
# - INSTANCE: default-fedora-29-2017-7-py2
|
|
||||||
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
|
|
||||||
# - INSTANCE: default-amazonlinux-2-2017-7-py2
|
|
||||||
|
|
||||||
|
## Script to run for the test stage
|
||||||
script:
|
script:
|
||||||
- bin/kitchen verify ${INSTANCE}
|
- bin/kitchen verify "${INSTANCE}"
|
||||||
|
|
||||||
|
## Stages and jobs matrix
|
||||||
|
stages:
|
||||||
|
- test
|
||||||
|
- name: release
|
||||||
|
if: branch = master AND type != pull_request
|
||||||
jobs:
|
jobs:
|
||||||
|
allow_failures:
|
||||||
|
- env: Lint_rubocop
|
||||||
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
# Define the `lint` stage (runs `yamllint` and `commitlint`)
|
## Define the test stage that runs the linters (and testing matrix, if applicable)
|
||||||
- stage: lint
|
|
||||||
language: node_js
|
# Run all of the linters in a single job (except `rubocop`)
|
||||||
|
- language: node_js
|
||||||
node_js: lts/*
|
node_js: lts/*
|
||||||
|
env: Lint
|
||||||
|
name: 'Lint: salt-lint, yamllint & commitlint'
|
||||||
before_install: skip
|
before_install: skip
|
||||||
script:
|
script:
|
||||||
|
# Install and run `salt-lint`
|
||||||
|
- pip install --user salt-lint
|
||||||
|
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
|
||||||
|
| xargs -I {} salt-lint {}
|
||||||
# Install and run `yamllint`
|
# Install and run `yamllint`
|
||||||
# Need at least `v1.17.0` for the `yaml-files` setting
|
# Need at least `v1.17.0` for the `yaml-files` setting
|
||||||
- pip install --user yamllint>=1.17.0
|
- pip install --user yamllint>=1.17.0
|
||||||
@@ -63,10 +46,56 @@ jobs:
|
|||||||
- npm install @commitlint/config-conventional -D
|
- npm install @commitlint/config-conventional -D
|
||||||
- npm install @commitlint/travis-cli -D
|
- npm install @commitlint/travis-cli -D
|
||||||
- commitlint-travis
|
- commitlint-travis
|
||||||
# Define the release stage that runs `semantic-release`
|
# Run the `rubocop` linter in a separate job that is allowed to fail
|
||||||
|
# Once these lint errors are fixed, this can be merged into a single job
|
||||||
|
- language: node_js
|
||||||
|
node_js: lts/*
|
||||||
|
env: Lint_rubocop
|
||||||
|
name: 'Lint: rubocop'
|
||||||
|
before_install: skip
|
||||||
|
script:
|
||||||
|
# Install and run `rubocop`
|
||||||
|
- gem install rubocop
|
||||||
|
- rubocop -d
|
||||||
|
|
||||||
|
## Define the rest of the matrix based on Kitchen testing
|
||||||
|
# Make sure the instances listed below match up with
|
||||||
|
# the `platforms` defined in `kitchen.yml`
|
||||||
|
- env: INSTANCE=default-debian-10-develop-py3
|
||||||
|
# - env: INSTANCE=default-ubuntu-1804-develop-py3
|
||||||
|
# - env: INSTANCE=default-centos-7-develop-py3
|
||||||
|
# - env: INSTANCE=default-fedora-30-develop-py3
|
||||||
|
# - env: INSTANCE=default-opensuse-leap-15-develop-py3
|
||||||
|
# - env: INSTANCE=default-amazonlinux-2-develop-py2
|
||||||
|
# - env: INSTANCE=default-arch-base-latest-develop-py2
|
||||||
|
# - env: INSTANCE=default-debian-9-2019-2-py3
|
||||||
|
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
|
||||||
|
- env: INSTANCE=default-centos-7-2019-2-py3
|
||||||
|
- env: INSTANCE=default-fedora-30-2019-2-py3
|
||||||
|
# - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
|
||||||
|
# - env: INSTANCE=default-amazonlinux-2-2019-2-py2
|
||||||
|
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
|
||||||
|
# - env: INSTANCE=default-debian-9-2018-3-py2
|
||||||
|
- env: INSTANCE=default-ubuntu-1604-2018-3-py2
|
||||||
|
# - env: INSTANCE=default-centos-7-2018-3-py2
|
||||||
|
# - env: INSTANCE=default-fedora-29-2018-3-py2
|
||||||
|
- env: INSTANCE=default-opensuse-leap-15-2018-3-py2
|
||||||
|
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
|
||||||
|
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
|
||||||
|
# - env: INSTANCE=default-debian-8-2017-7-py2
|
||||||
|
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2
|
||||||
|
- env: INSTANCE=default-centos-6-2017-7-py2
|
||||||
|
# - env: INSTANCE=default-fedora-29-2017-7-py2
|
||||||
|
# - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
|
||||||
|
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
|
||||||
|
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
|
||||||
|
|
||||||
|
## Define the release stage that runs `semantic-release`
|
||||||
- stage: release
|
- stage: release
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js: lts/*
|
node_js: lts/*
|
||||||
|
env: Release
|
||||||
|
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
|
||||||
before_install: skip
|
before_install: skip
|
||||||
script:
|
script:
|
||||||
# Update `AUTHORS.md`
|
# Update `AUTHORS.md`
|
||||||
|
|||||||
@@ -7,10 +7,12 @@ extends: default
|
|||||||
# Files to ignore completely
|
# Files to ignore completely
|
||||||
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
|
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
|
||||||
# 2. Any SLS files under directory `test/`, which are actually state files
|
# 2. Any SLS files under directory `test/`, which are actually state files
|
||||||
# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
|
# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
|
||||||
|
# 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
|
||||||
ignore: |
|
ignore: |
|
||||||
node_modules/
|
node_modules/
|
||||||
test/**/states/**/*.sls
|
test/**/states/**/*.sls
|
||||||
|
.kitchen/
|
||||||
pillar.example
|
pillar.example
|
||||||
postgres/codenamemap.yaml
|
postgres/codenamemap.yaml
|
||||||
postgres/osfamilymap.yaml
|
postgres/osfamilymap.yaml
|
||||||
@@ -22,6 +24,7 @@ yaml-files:
|
|||||||
# Default settings
|
# Default settings
|
||||||
- '*.yaml'
|
- '*.yaml'
|
||||||
- '*.yml'
|
- '*.yml'
|
||||||
|
- .salt-lint
|
||||||
- .yamllint
|
- .yamllint
|
||||||
# SaltStack Formulas additional settings
|
# SaltStack Formulas additional settings
|
||||||
- '*.example'
|
- '*.example'
|
||||||
@@ -35,3 +38,6 @@ rules:
|
|||||||
# Increase from default of `80`
|
# Increase from default of `80`
|
||||||
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
||||||
max: 88
|
max: 88
|
||||||
|
octal-values:
|
||||||
|
forbid-implicit-octal: true
|
||||||
|
forbid-explicit-octal: true
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord
|
|||||||
|
|
||||||
Avatar|Contributor|Contributions
|
Avatar|Contributor|Contributions
|
||||||
:-:|---|:-:
|
:-:|---|:-:
|
||||||
|
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|70
|
||||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|62
|
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|62
|
||||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|59
|
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|53
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|53
|
||||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
|
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
|
||||||
@@ -70,4 +70,4 @@ Avatar|Contributor|Contributions
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-09-13.
|
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.
|
||||||
|
|||||||
17
CHANGELOG.md
17
CHANGELOG.md
@@ -1,5 +1,22 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.40.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3) (2019-10-10)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **manage.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6))
|
||||||
|
* **python.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc))
|
||||||
|
|
||||||
|
|
||||||
|
### Continuous Integration
|
||||||
|
|
||||||
|
* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3))
|
||||||
|
* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39))
|
||||||
|
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/3a27978))
|
||||||
|
* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34))
|
||||||
|
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48))
|
||||||
|
|
||||||
## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13)
|
## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
FORMULA
2
FORMULA
@@ -1,7 +1,7 @@
|
|||||||
name: postgres
|
name: postgres
|
||||||
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
|
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
|
||||||
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
|
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
|
||||||
version: 0.40.2
|
version: 0.40.3
|
||||||
release: 1
|
release: 1
|
||||||
minimum_version: 2016.11
|
minimum_version: 2016.11
|
||||||
summary: Postgres formula
|
summary: Postgres formula
|
||||||
|
|||||||
7
Gemfile
7
Gemfile
@@ -1,6 +1,7 @@
|
|||||||
source "https://rubygems.org"
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'kitchen-docker', '>= 2.9'
|
gem 'kitchen-docker', '>= 2.9'
|
||||||
gem 'kitchen-salt', '>= 0.6.0'
|
|
||||||
gem 'kitchen-inspec', '>= 1.1'
|
gem 'kitchen-inspec', '>= 1.1'
|
||||||
|
gem 'kitchen-salt', '>= 0.6.0'
|
||||||
|
|||||||
19
bin/kitchen
19
bin/kitchen
@@ -8,22 +8,25 @@
|
|||||||
# this file is here to facilitate running it.
|
# this file is here to facilitate running it.
|
||||||
#
|
#
|
||||||
|
|
||||||
require "pathname"
|
require 'pathname'
|
||||||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
|
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
|
||||||
Pathname.new(__FILE__).realpath)
|
Pathname.new(__FILE__).realpath)
|
||||||
|
|
||||||
bundle_binstub = File.expand_path("../bundle", __FILE__)
|
bundle_binstub = File.expand_path('bundle', __dir__)
|
||||||
|
|
||||||
if File.file?(bundle_binstub)
|
if File.file?(bundle_binstub)
|
||||||
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
|
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
|
||||||
load(bundle_binstub)
|
load(bundle_binstub)
|
||||||
else
|
else
|
||||||
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
|
abort(
|
||||||
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
|
'Your `bin/bundle` was not generated by Bundler, '\
|
||||||
|
'so this binstub cannot run. Replace `bin/bundle` by running '\
|
||||||
|
'`bundle binstubs bundler --force`, then run this command again.'
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require "rubygems"
|
require 'rubygems'
|
||||||
require "bundler/setup"
|
require 'bundler/setup'
|
||||||
|
|
||||||
load Gem.bin_path("test-kitchen", "kitchen")
|
load Gem.bin_path('test-kitchen', 'kitchen')
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||||||
* - Avatar
|
* - Avatar
|
||||||
- Contributor
|
- Contributor
|
||||||
- Contributions
|
- Contributions
|
||||||
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
|
||||||
|
- `@myii <https://github.com/myii>`_
|
||||||
|
- 70
|
||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
|
||||||
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
|
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
|
||||||
- 62
|
- 62
|
||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
|
|
||||||
- `@myii <https://github.com/myii>`_
|
|
||||||
- 59
|
|
||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
|
||||||
- `@aboe76 <https://github.com/aboe76>`_
|
- `@aboe76 <https://github.com/aboe76>`_
|
||||||
- 53
|
- 53
|
||||||
@@ -206,4 +206,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-09-13.
|
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-10.
|
||||||
|
|||||||
@@ -2,6 +2,26 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
`0.40.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3>`_ (2019-10-10)
|
||||||
|
-------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Bug Fixes
|
||||||
|
^^^^^^^^^
|
||||||
|
|
||||||
|
|
||||||
|
* **manage.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6>`_\ )
|
||||||
|
* **python.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc>`_\ )
|
||||||
|
|
||||||
|
Continuous Integration
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
|
||||||
|
* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3>`_\ )
|
||||||
|
* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39>`_\ )
|
||||||
|
* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/3a27978>`_\ )
|
||||||
|
* **platform:** add ``arch-base-latest`` (commented out for now) [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34>`_\ )
|
||||||
|
* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48>`_\ )
|
||||||
|
|
||||||
`0.40.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2>`_ (2019-09-13)
|
`0.40.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2>`_ (2019-09-13)
|
||||||
-------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
58
kitchen.yml
58
kitchen.yml
@@ -38,11 +38,15 @@ platforms:
|
|||||||
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
- name: opensuse-leap-15-develop-py3
|
- name: opensuse-leap-15-develop-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-develop-py3:opensuse-leap-15
|
image: opensuse/leap:15
|
||||||
provision_command:
|
provision_command:
|
||||||
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
# yamllint disable-line rule:line-length
|
||||||
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
|
||||||
|
- systemctl enable sshd.service
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
provisioner:
|
||||||
|
salt_bootstrap_options: -XdPfrq -x python3 git develop
|
||||||
|
salt_install: bootstrap
|
||||||
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
||||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||||
transport:
|
transport:
|
||||||
@@ -53,6 +57,13 @@ platforms:
|
|||||||
provision_command:
|
provision_command:
|
||||||
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
|
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
|
||||||
|
- name: arch-base-latest-develop-py2
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-develop-py2:arch-base-latest
|
||||||
|
provision_command:
|
||||||
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
|
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
|
||||||
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
## SALT `2019.2`
|
## SALT `2019.2`
|
||||||
- name: debian-9-2019-2-py3
|
- name: debian-9-2019-2-py3
|
||||||
@@ -69,8 +80,15 @@ platforms:
|
|||||||
image: netmanagers/salt-2019.2-py3:fedora-30
|
image: netmanagers/salt-2019.2-py3:fedora-30
|
||||||
- name: opensuse-leap-15-2019-2-py3
|
- name: opensuse-leap-15-2019-2-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
image: opensuse/leap:15
|
||||||
|
provision_command:
|
||||||
|
# yamllint disable-line rule:line-length
|
||||||
|
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
|
||||||
|
- systemctl enable sshd.service
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
provisioner:
|
||||||
|
salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
|
||||||
|
salt_install: bootstrap
|
||||||
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
||||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||||
transport:
|
transport:
|
||||||
@@ -78,6 +96,10 @@ platforms:
|
|||||||
- name: amazonlinux-2-2019-2-py2
|
- name: amazonlinux-2-2019-2-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2019.2-py2:amazonlinux-2
|
image: netmanagers/salt-2019.2-py2:amazonlinux-2
|
||||||
|
- name: arch-base-latest-2019-2-py2
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-2019.2-py2:arch-base-latest
|
||||||
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
## SALT `2018.3`
|
## SALT `2018.3`
|
||||||
- name: debian-9-2018-3-py2
|
- name: debian-9-2018-3-py2
|
||||||
@@ -94,8 +116,15 @@ platforms:
|
|||||||
image: netmanagers/salt-2018.3-py2:fedora-29
|
image: netmanagers/salt-2018.3-py2:fedora-29
|
||||||
- name: opensuse-leap-15-2018-3-py2
|
- name: opensuse-leap-15-2018-3-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
|
image: opensuse/leap:15
|
||||||
|
provision_command:
|
||||||
|
# yamllint disable-line rule:line-length
|
||||||
|
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
|
||||||
|
- systemctl enable sshd.service
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
provisioner:
|
||||||
|
salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
|
||||||
|
salt_install: bootstrap
|
||||||
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
||||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||||
transport:
|
transport:
|
||||||
@@ -103,6 +132,10 @@ platforms:
|
|||||||
- name: amazonlinux-2-2018-3-py2
|
- name: amazonlinux-2-2018-3-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:amazonlinux-2
|
image: netmanagers/salt-2018.3-py2:amazonlinux-2
|
||||||
|
- name: arch-base-latest-2018-3-py2
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-2018.3-py2:arch-base-latest
|
||||||
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
## SALT `2017.7`
|
## SALT `2017.7`
|
||||||
- name: debian-8-2017-7-py2
|
- name: debian-8-2017-7-py2
|
||||||
@@ -120,8 +153,15 @@ platforms:
|
|||||||
image: netmanagers/salt-2017.7-py2:fedora-29
|
image: netmanagers/salt-2017.7-py2:fedora-29
|
||||||
- name: opensuse-leap-15-2017-7-py2
|
- name: opensuse-leap-15-2017-7-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
|
image: opensuse/leap:15
|
||||||
|
provision_command:
|
||||||
|
# yamllint disable-line rule:line-length
|
||||||
|
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
|
||||||
|
- systemctl enable sshd.service
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
provisioner:
|
||||||
|
salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
|
||||||
|
salt_install: bootstrap
|
||||||
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
|
||||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||||
transport:
|
transport:
|
||||||
@@ -129,10 +169,14 @@ platforms:
|
|||||||
- name: amazonlinux-2-2017-7-py2
|
- name: amazonlinux-2-2017-7-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2017.7-py2:amazonlinux-2
|
image: netmanagers/salt-2017.7-py2:amazonlinux-2
|
||||||
|
- name: arch-base-latest-2017-7-py2
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-2017.7-py2:arch-base-latest
|
||||||
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: salt_solo
|
name: salt_solo
|
||||||
log_level: info
|
log_level: debug
|
||||||
salt_install: none
|
salt_install: none
|
||||||
require_chef: false
|
require_chef: false
|
||||||
formula: postgres
|
formula: postgres
|
||||||
|
|||||||
@@ -15,3 +15,4 @@ supports:
|
|||||||
- platform-name: suse
|
- platform-name: suse
|
||||||
- platform-name: freebsd
|
- platform-name: freebsd
|
||||||
- platform-name: amazon
|
- platform-name: amazon
|
||||||
|
- platform-name: arch
|
||||||
|
|||||||
Reference in New Issue
Block a user