Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian González Di Antonio committed Feb 4, 2020
2 parents 8f5cefa + 32e40f5 commit 58cc02b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: python

python:
- '2.7'
- '3.7'
- "2.7"
- "3.7"
services: docker

branches:
Expand All @@ -23,7 +23,7 @@ env:

install:
- pip install ansible"${ANSIBLE_VERSION}"
- pip install molecule">=2.22rc1"
- pip install molecule
- pip install docker
- pip install flake8
- pip install selinux
Expand All @@ -37,6 +37,7 @@ before_script:
- ls -la
- mv $GITHUB_ROLE_NAME $GALAXY_ROLE_NAME
- cd $GALAXY_ROLE_NAME
- ls -la

script:
- molecule --version
Expand All @@ -52,7 +53,7 @@ jobs:
include:
- stage: GitHub Release
python:
- '3.7'
- "3.7"
script:
- skip
before_deploy:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.3
2.0.4
4 changes: 4 additions & 0 deletions VERSION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# VERSION Details

## 2.0.4

* Fixed ubuntu: fix gpg signature download #18 [ubuntu: fix gpg signature download](https://github.com/christiangda/ansible-role-amazon-cloudwatch-agent/pull/18)

## 2.0.3

* Fixed variable problem reporte in issue #14 [cwa_use_credentials: false is not working for role based installation](https://github.com/christiangda/ansible-role-amazon-cloudwatch-agent/issues/14)
Expand Down
4 changes: 2 additions & 2 deletions tasks/install-debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

- name: Download {{ cwa_package }}.deb.sig file
get_url:
url: "{{ cwa_package_url }}"
url: "{{ cwa_package_signature }}"
dest: "{{ cwa_temp_path }}/{{ cwa_package }}.deb.sig"
timeout: "{{ cwa_global_downloads_timeout }}"
tags:
Expand All @@ -40,7 +40,7 @@
- name: Verify {{ cwa_package }} package signature
command: gpg --verify {{ cwa_package }}.deb.sig {{ cwa_package }}.deb
register: verified_sig
failed_when: "'BAD' in verified_sig.stderr"
failed_when: "'BAD' in verified_sig.stderr or 'gpg: no valid OpenPGP data found' in verified_sig.stderr"
changed_when: false
args:
chdir: "{{ cwa_temp_path }}"
Expand Down

0 comments on commit 58cc02b

Please sign in to comment.