Skip to content

Commit

Permalink
[GITHUB-50] Update the role tests to use latest libs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
wojtek-oledzki committed Nov 28, 2019
1 parent 90e449e commit ce40774
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 23 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.2
v3.3
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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)
$(MAKEFILE_LIST)
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---

galaxy_info:
authod: sansible
author: sansible
description: "Install Kafka server."
license: MIT
min_ansible_version: 2.5
min_ansible_container_version: 2.5
platforms:
- name: Ubuntu
versions:
- trusty
- xenial
- bionic
galaxy_tags:
Expand Down
8 changes: 0 additions & 8 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
6 changes: 4 additions & 2 deletions tasks/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce40774

Please sign in to comment.