From ce40774b9bd01d7a45f8d081df3c7347202e1b2e Mon Sep 17 00:00:00 2001
From: Wojtek Oledzki <wojtek@voytek.solutions>
Date: Thu, 28 Nov 2019 11:43:28 +0000
Subject: [PATCH] [GITHUB-50] Update the role tests to use latest libs

Update role version to v3.3
* default Kafka version is now 2.3.1 (1.12)
* Ansible updated to 2.7, 2.8 and 2.9
* dropped tests for Ubuntu Trusty
---
 .travis.yml                   | 6 +++---
 .version                      | 2 +-
 Makefile                      | 4 ++--
 defaults/main.yml             | 4 ++--
 meta/main.yml                 | 3 +--
 molecule/default/molecule.yml | 8 --------
 requirements.txt              | 4 +---
 tasks/build.yml               | 6 ++++--
 8 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index adeaf47..b364b9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,9 @@ branches:
     - master
 
 env:
-  - ANSIBLE_INSTALL_VERSION=2.5.14
-  - ANSIBLE_INSTALL_VERSION=2.6.13
-  - ANSIBLE_INSTALL_VERSION=2.7.7
+  - ANSIBLE_INSTALL_VERSION=2.7.15
+  - ANSIBLE_INSTALL_VERSION=2.8.7
+  - ANSIBLE_INSTALL_VERSION=2.9.1
 
 services:
   - docker
diff --git a/.version b/.version
index 4d5034c..a6c6260 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-v3.2
+v3.3
diff --git a/Makefile b/Makefile
index 2b544aa..ea4121e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ANSIBLE_INSTALL_VERSION ?= 2.7.7
+ANSIBLE_INSTALL_VERSION ?= 2.9.1
 PATH := $(PWD)/.venv_ansible$(ANSIBLE_INSTALL_VERSION)/bin:$(shell printenv PATH)
 SHELL := env PATH=$(PATH) /bin/bash
 
@@ -90,4 +90,4 @@ help:
 		 /^#/  { doc=doc "\n" substr($$0, 2); next } \
 		 /:/   { sub(/:.*/, "", $$0); \
 		 printf "\033[34m%-30s\033[0m\033[1m%s\033[0m %s\n\n", $$0, doc_h, doc; skip=1 }' \
-		$(MAKEFILE_LIST)
\ No newline at end of file
+		$(MAKEFILE_LIST)
diff --git a/defaults/main.yml b/defaults/main.yml
index 0ac1ee0..a89b47b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -19,8 +19,8 @@ sansible_kafka_port: 9092
 sansible_kafka_server_properties: {}
 sansible_kafka_tarball_location: /home/kafka/tmp
 sansible_kafka_user: kafka
-sansible_kafka_version_kafka: 2.1.0
-sansible_kafka_version_scala: 2.11
+sansible_kafka_version_kafka: 2.3.1
+sansible_kafka_version_scala: 2.12
 sansible_kafka_wait_for_kafka_port: 120
 sansible_kafka_zookeeper_connection_timeout_ms: 1000000
 sansible_kafka_zookeeper_hosts:
diff --git a/meta/main.yml b/meta/main.yml
index e8e90e3..b17ec91 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 
 galaxy_info:
-  authod: sansible
+  author: sansible
   description: "Install Kafka server."
   license: MIT
   min_ansible_version: 2.5
@@ -9,7 +9,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - trusty
         - xenial
         - bionic
   galaxy_tags:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 373990f..1d50ee6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,8 +4,6 @@ driver:
   name: docker
 
 platforms:
-  - name: sansible_kafka-trusty
-    image: ubuntu:trusty
   - name: sansible_kafka-xenial
     image: solita/ubuntu-systemd:xenial
     command: /sbin/init
@@ -40,12 +38,6 @@ provisioner:
         sansible_kafka_server_properties:
           listeners: "PLAINTEXT://127.0.0.1:9092"
           broker.id: 11
-      # trusty is using good old ifconfig
-      sansible_kafka-trusty:
-        sansible_kafka_server_properties:
-          broker.id: 11
-        sansible_kafka_interface_bind: lo
-        sansible_kafka_interface_advertise: lo
 
 lint:
   name: yamllint
diff --git a/requirements.txt b/requirements.txt
index b77d35e..4596c6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,2 @@
 docker-py==1.10.6
-molecule==2.19.0
-# there is a bug with cache in latest 3.10.0
-pytest==3.9.3
+molecule==2.22
diff --git a/tasks/build.yml b/tasks/build.yml
index b74435f..5f7b972 100644
--- a/tasks/build.yml
+++ b/tasks/build.yml
@@ -22,8 +22,10 @@
   become: yes
   become_user: "{{ sansible_kafka_user }}"
   get_url:
-    dest: "/home/{{ sansible_kafka_user }}/tmp/kafka_{{ sansible_kafka_version_scala }}-{{ sansible_kafka_version_kafka }}.tgz"
-    url: "{{ sansible_kafka_apache_mirror }}/kafka/{{ sansible_kafka_version_kafka }}/kafka_{{ sansible_kafka_version_scala }}-{{ sansible_kafka_version_kafka }}.tgz"
+    dest: "/home/{{ sansible_kafka_user }}/tmp/\
+      kafka_{{ sansible_kafka_version_scala }}-{{ sansible_kafka_version_kafka }}.tgz"
+    url: "{{ sansible_kafka_apache_mirror }}/kafka/{{ sansible_kafka_version_kafka }}/\
+      kafka_{{ sansible_kafka_version_scala }}-{{ sansible_kafka_version_kafka }}.tgz"
 
 - name: Uncompress the kafka tar
   become: yes