Merge remote-tracking branch 'dist/master'

.ci/ansible-setup.sh

@@ -8,11 +8,11 @@ set -e
 echo "Setting up Ansible Version Manager"
 AVM_VERSION="v1.0.0"
 ## Install Ansible using pip and label it 
-export ANSIBLE_VERSIONS_0="2.8.4.0"
+export ANSIBLE_VERSIONS_0="2.9.2.0"
 export INSTALL_TYPE_0="pip"
-export ANSIBLE_LABEL_0="v2.8"
+export ANSIBLE_LABEL_0="v2.9"
 # Whats the default version
-export ANSIBLE_DEFAULT_VERSION="v2.8"
+export ANSIBLE_DEFAULT_VERSION="v2.9"
 
 ## Create a temp dir to download avm
 avm_dir="$(mktemp -d 2> /dev/null || mktemp -d -t 'mytmpdir')"

.ci/before_script.sh

@@ -11,7 +11,7 @@ function update_linux() {
 function install_ansible {
   bash .ci/ansible-setup.sh
   # pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error
-  ~/.avm/v2.8/venv/bin/pip install netaddr ansible-lint   pyOpenSSL ndg-httpsclient pyasn1
+  ~/.avm/v2.9/venv/bin/pip install netaddr ansible-lint   pyOpenSSL ndg-httpsclient pyasn1
 }
 
 

.ci/script.sh

@@ -8,7 +8,7 @@ function run_kitchen_tests {
   python3 --version
   pip3 --version
   bundler --version
-  bundle show
+  bundle list
   bundle exec kitchen test --test-base-path="$PWD/.ci/integration" $KITCHEN_REGEXP
 }
 

.kitchen.yml

@@ -11,7 +11,7 @@ provisioner:
   ansible_verbose: false
   require_ansible_repo: false
   require_ansible_omnibus: true
-  ansible_version: 2.8.4
+  ansible_version: 2.9.2
   require_chef_for_busser: false
   sudo_command: sudo -E -H
   idempotency_test: false

.travis.yml

@@ -20,12 +20,12 @@ matrix:
       language: shell
       #language: ruby
       #rvm: 2.6
-    - os: linux
-      env: KITCHEN_REGEXP="gnupg1-alpine-latest"; SECRETS_TEST_VERBOSE=1
-      services: docker
-      sudo: required
-      language: ruby
-      rvm: 2.6
+    #- os: linux
+    #  env: KITCHEN_REGEXP="gnupg1-alpine-latest"; SECRETS_TEST_VERBOSE=1
+    #  services: docker
+    #  sudo: required
+    #  language: ruby
+    #  rvm: 2.6
     - os: linux
       env: KITCHEN_REGEXP="gnupg1-debian-latest"
       services: docker
@@ -50,12 +50,12 @@ matrix:
       sudo: required
       language: ruby
       rvm: 2.6
-    - os: linux
-      env: KITCHEN_REGEXP="gnupg2-alpine-latest"
-      services: docker
-      sudo: required
-      language: ruby
-      rvm: 2.6
+    #- os: linux
+    #  env: KITCHEN_REGEXP="gnupg2-alpine-latest"
+    #  services: docker
+    #  sudo: required
+    #  language: ruby
+    #  rvm: 2.6
     # distribute deb on this successful test
     - os: linux
       env: KITCHEN_REGEXP="gnupg2-debian-latest"; GITSECRET_DIST="deb"

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## {Next Version}
+
+### Misc
+
+- Reflect changes in ruby bundler during build process
+- Upgrade build process to ansible 2.9
+
 ## Version 0.3.2
 
 ### Bugfixes