From f14804254c87b5a8098ca8b3a05bb9c95c516b41 Mon Sep 17 00:00:00 2001
From: Josh Rabinowitz <joshr@joshr.com>
Date: Wed, 8 Jan 2020 10:15:22 -0500
Subject: [PATCH 1/2] Upgrade ansible to 2.9.2 (#571)

* upgrade ansible to 2.9.2
* Temporarily disable alpine builds because of #569
---
 .ci/ansible-setup.sh |  6 +++---
 .ci/before_script.sh |  2 +-
 .kitchen.yml         |  2 +-
 .travis.yml          | 24 ++++++++++++------------
 CHANGELOG.md         |  6 ++++++
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.ci/ansible-setup.sh b/.ci/ansible-setup.sh
index f235341d..564f6120 100755
--- a/.ci/ansible-setup.sh
+++ b/.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')"
diff --git a/.ci/before_script.sh b/.ci/before_script.sh
index 8556b6bb..42fb62a5 100644
--- a/.ci/before_script.sh
+++ b/.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
 }
 
 
diff --git a/.kitchen.yml b/.kitchen.yml
index dae7c6c3..885301c5 100644
--- a/.kitchen.yml
+++ b/.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
diff --git a/.travis.yml b/.travis.yml
index f1267e6b..edc000a3 100644
--- a/.travis.yml
+++ b/.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"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d548cdb..e642dabc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## {Next Version}
+
+#### Misc
+
+- Upgrade build process to ansible 2.9
+
 ## Version 0.3.2
 
 ### Bugfixes

From 84aaf287843828f338c8de6fedd9b08a64472bc7 Mon Sep 17 00:00:00 2001
From: Josh Rabinowitz <joshr@joshr.com>
Date: Wed, 8 Jan 2020 11:42:53 -0500
Subject: [PATCH 2/2] Use "bundle list", not "bundle show" and disable alpine
 tests (#570)

* use 'bundle list', not 'bundle show'
* disable alpine tests because of #569
---
 .ci/script.sh | 2 +-
 CHANGELOG.md  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ci/script.sh b/.ci/script.sh
index 7e1ab8f4..b2df8e13 100644
--- a/.ci/script.sh
+++ b/.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
 }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e642dabc..377cddcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## {Next Version}
 
-#### Misc
+### Misc
 
+- Reflect changes in ruby bundler during build process
 - Upgrade build process to ansible 2.9
 
 ## Version 0.3.2