Merge remote-tracking branch 'dist/master'

.Dockerfiles/alpine/latest/Dockerfile

@@ -16,12 +16,12 @@ RUN apk add --no-cache --update \
 	openssh-sftp-server \
 	openssl-dev \
 	py-boto \
-	py2-pip \
-	python2-dev \
+	py-pip \
+	python3-dev \
 	rsyslog \
 	sudo \
 	xz \
- && pip install --upgrade pip \
+ && pip3 install --upgrade pip \
  && if ! getent passwd <%= @username %>; then \
       adduser -h /home/<%= @username %> -s /bin/bash -D <%= @username %>; \
       passwd -d <%= @username %>; \

.Dockerfiles/debian/latest/Dockerfile

@@ -11,11 +11,11 @@ RUN apt-get update \
 	lsb-release \
 	net-tools \
 	openssh-server \
-	python-pip \
-	python2.7 \
+	python3-pip \
+	python3 \
 	sudo \
 	systemd \
- && pip install --upgrade pip \
+ && pip3 install --upgrade pip \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
  && if ! getent passwd <%= @username %>; then \

.Dockerfiles/fedora/latest/Dockerfile

@@ -13,13 +13,14 @@ RUN dnf clean all \
 	net-tools \
 	openssh-server \
 	openssl-devel \
-	python2-devel \
-	python2-pip \
+	python3-devel \
+	python3-pip \
+	python3-dnf \
 	redhat-lsb \
 	redhat-rpm-config \
 	sudo \
 	systemd \
- && pip install --upgrade pip \
+ && pip3 install --upgrade pip \
  && dnf clean all \
  && if ! getent passwd <%= @username %>; then \
       useradd -d /home/<%= @username %> -m -s /usr/bin/bash -p '*' <%= @username %>; \

.Dockerfiles/ubuntu/latest/Dockerfile

@@ -11,11 +11,11 @@ RUN apt-get update \
 	lsb-release \
 	net-tools \
 	openssh-server \
-	python-pip \
-	python2.7 \
+	python3-pip \
+	python3 \
 	sudo \
 	systemd \
- && pip install --upgrade pip \
+ && pip3 install --upgrade pip \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
  && if ! getent passwd <%= @username %>; then \

.Dockerfiles/ubuntu/rolling/Dockerfile

@@ -12,11 +12,11 @@ RUN apt-get update \
 	lsb-release \
 	net-tools \
 	openssh-server \
-	python-pip \
-	python2.7 \
+	python3-pip \
+	python3 \
 	sudo \
 	systemd \
- && pip install --upgrade pip \
+ && pip3 install --upgrade pip \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
  && if ! getent passwd <%= @username %>; then \

.ci/ansible-setup.sh

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

.ci/before_script.sh

@@ -5,13 +5,13 @@ set -e
 # Linux helper functions:
 function update_linux() {
   sudo apt-get update -qq
-  sudo apt-get install -qq python-apt python-pycurl git python-pip build-essential autoconf rpm
+  sudo apt-get install -qq python3-apt python3-pycurl git python3-pip build-essential autoconf rpm
 }
 
 function install_ansible {
   bash .ci/ansible-setup.sh
   # pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error
-  ~/.avm/v2.5/venv/bin/pip install netaddr ansible-lint   pyOpenSSL ndg-httpsclient pyasn1
+  ~/.avm/v2.8/venv/bin/pip install netaddr ansible-lint   pyOpenSSL ndg-httpsclient pyasn1
 }
 
 

.ci/integration/gnupg-git/default.yml

@@ -19,7 +19,7 @@
 
     - name: Set deb-src check results
       set_fact:
-        deb_src_check_result: "{{ deb_src_check.stdout | default(0) | int }}"
+        deb_src_check_result: "{{ deb_src_check.stdout | default(0) }}"
 
     - name: Enable Ubuntu main & restricted source repo
       replace:
@@ -28,7 +28,7 @@
         replace: '\2 # enabled'
       when:
         - ansible_distribution == "Ubuntu"
-        - deb_src_check_result >= 1
+        - deb_src_check_result|int < 1
 
     - name: Remove dpkg excludes on Ubuntu
       replace:
@@ -45,7 +45,7 @@
         replace: '\1\2\ndeb-src\2'
       when:
         - ansible_distribution == "Debian"
-        - deb_src_check_result >= 1
+        - deb_src_check_result|int < 1
 
     - name: Install gnupg build dependencies for Debian based distros
       apt:

.ci/integration/vars/Alpine.yml

@@ -1,4 +1,5 @@
 ---
+ansible_python_interpreter: /usr/bin/python3
 test_dependencies:
   - gawk
   - git

.ci/integration/vars/Fedora.yml

@@ -1,4 +1,5 @@
 ---
+ansible_python_interpreter: /usr/bin/python3
 test_dependencies:
   - gawk
   - git

.ci/integration/vars/Ubuntu.yml

@@ -1,4 +1,5 @@
 ---
+ansible_python_interpreter: /usr/bin/python3
 test_dependencies:
   - gawk
   - git

.ci/integration/vars/default.yml

@@ -1,4 +1,5 @@
 ---
+ansible_python_interpreter: /usr/bin/python3
 test_dependencies:
   - gawk
   - make

.ci/script.sh

@@ -5,8 +5,8 @@ set -e
 function run_kitchen_tests {
   ansible --version
   ruby --version
-  python --version
-  pip --version
+  python3 --version
+  pip3 --version
   bundler --version
   bundle show
   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.5.0
+  ansible_version: 2.8.4
   require_chef_for_busser: false
   sudo_command: sudo -E -H
   idempotency_test: false

CHANGELOG.md

@@ -2,10 +2,13 @@
 
 ## {{Next Version}}
 
+### Features
+
+- Support SECRETS_PINENTRY env var for gnupg --pinentry-mode parameter (#221)
+
 ### Bugfixes
 
 - Use OSX's mktemp on OSX, even if there's another version in PATH. (#485)
-- Support SECRETS_PINENTRY env var for gnupg --pinentry-mode parameter (#221)
 - Make rsync a build requirement on debian (#500)
 - When tests specify gnupg1, use gnupg1, not gnupg2 (#241)
 - Ignore revoked gnupg keys (#508)
@@ -13,6 +16,9 @@
 ## Misc
 
 - Add note about secrets and old keys (#499)
+- Transition build process from python 2 to python 3 (#487)
+- Upgrade build process from ansible 2.5 to ansible 2.8
+- Fix in build process when installing gnupg2 source deps on Ubuntu
 - Improve code comments
 
 ## Version 0.2.6