From a4f3824e898ca21089211b9ed780f61cd39b3521 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 17 Jan 2017 08:31:26 +0100 Subject: [PATCH 1/3] Added latest Ansible versions --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d6f98b5..6a974db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,9 @@ python: "2.7" env: - ANSIBLE_VERSION=latest + - ANSIBLE_VERSION=2.2.1.0 - ANSIBLE_VERSION=2.2.0.0 + - ANSIBLE_VERSION=2.1.4 - ANSIBLE_VERSION=2.1.3 - ANSIBLE_VERSION=2.1.2 - ANSIBLE_VERSION=2.1.1.0 From 77ff02c1db148a13319dc04862be600919f9f7ab Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 17 Jan 2017 09:25:47 +0100 Subject: [PATCH 2/3] Use command instead of unarchive --- .travis.yml | 5 ++++- tasks/main.yml | 28 ++++++---------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a974db..b98b06f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,8 @@ before_install: install: # Install Ansible. - - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install --no-binary ansible ansible; else pip install --no-binary ansible ansible==$ANSIBLE_VERSION; fi + - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install --no-binary ansible ansible==$ANSIBLE_VERSION; fi + - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible-lint; fi script: # Check the role/playbook's syntax. @@ -78,6 +79,8 @@ script: && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) + - if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint || true; fi + notifications: email: false hipchat: diff --git a/tasks/main.yml b/tasks/main.yml index a15fe30..08d3cf5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,38 +25,22 @@ - komodo-ide-download - name: extract - unarchive: - src: "{{ komodo_ide_downloads_path }}/Komodo-IDE-{{ komodo_ide_version }}-{{ komodo_ide_build }}-linux-{{ komodo_ide_machine_map[ansible_machine] }}.tar.gz" - dest: "{{ komodo_ide_downloads_path }}/" - owner: root - group: root - mode: 0755 + command: > + tar -xzvf "{{ komodo_ide_downloads_path }}/Komodo-IDE-{{ komodo_ide_version }}-{{ komodo_ide_build }}-linux-{{ komodo_ide_machine_map[ansible_machine] }}.tar.gz" + args: + chdir: "{{ komodo_ide_downloads_path }}" creates: "{{ komodo_ide_downloads_path }}/Komodo-IDE-{{ komodo_ide_version }}-{{ komodo_ide_build }}-linux-{{ komodo_ide_machine_map[ansible_machine] }}/install.sh" - copy: false - register: unarchive + register: _unarchive tags: - configuration - komodo-ide - komodo-ide-extract -- name: chown - file: - path: "{{ komodo_ide_downloads_path }}/Komodo-IDE-{{ komodo_ide_version }}-{{ komodo_ide_build }}-linux-{{ komodo_ide_machine_map[ansible_machine] }}" - state: directory - owner: root - group: root - recurse: true - when: unarchive | changed and (ansible_version is not defined or ansible_version.full | version_compare('1.9', '<')) - tags: - - configuration - - komodo-ide - - komodo-ide-chown - - name: install command: ./install.sh --install-dir {{ komodo_ide_install_prefix }}/Komodo-IDE-{{ komodo_ide_version }}-{{ komodo_ide_build }} args: chdir: "{{ komodo_ide_downloads_path }}/Komodo-IDE-{{ komodo_ide_version }}-{{ komodo_ide_build }}-linux-{{ komodo_ide_machine_map[ansible_machine] }}" - when: unarchive | changed + when: _unarchive | changed tags: - configuration - komodo-ide From 62af5d52b43400325ca879b78196945b13b09d4d Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 17 Jan 2017 09:44:19 +0100 Subject: [PATCH 3/3] Cleanup of allow_failures [ci skip] --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b98b06f..4ef33ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,13 +50,6 @@ branches: only: - master -matrix: - allow_failures: - # Idempotency test fails, see https://groups.google.com/forum/#!msg/ansible-project/jwYFl8zw8Qw/1yhSq86uFmYJ - - env: ANSIBLE_VERSION=1.8.2 - - env: ANSIBLE_VERSION=1.8.1 - - env: ANSIBLE_VERSION=1.8 - before_install: - sudo apt-get update -qq @@ -79,7 +72,7 @@ script: && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) - - if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint || true; fi + - if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi notifications: email: false