This repository was archived by the owner on Mar 6, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +20
-46
lines changed Expand file tree Collapse file tree 4 files changed +20
-46
lines changed Original file line number Diff line number Diff line change @@ -3,29 +3,22 @@ language: python
3
3
cache : pip
4
4
services :
5
5
- docker
6
- # before_install:
7
- # - sudo apt-get -qq update
8
- # - sudo apt-get install -y iproute net-tools
6
+ env :
7
+ - ANSIBLE=2.2.3 PROMETHEUS=1.8.2
8
+ - ANSIBLE=2.2.3 PROMETHEUS=2.0.0
9
+ - ANSIBLE=2.3.2 PROMETHEUS=1.8.2
10
+ - ANSIBLE=2.3.2 PROMETHEUS=2.0.0
11
+ - ANSIBLE=2.4.1 PROMETHEUS=1.8.2
12
+ - ANSIBLE=2.4.1 PROMETHEUS=2.0.0
9
13
install :
10
- - pip install ansible==2.3.2 molecule==1.25.0 docker git-semver testinfra>=1.7.0
14
+ - pip install ansible==${ANSIBLE} ansible-lint>=3.4.15 molecule==1.25.0 docker git-semver testinfra>=1.7.0
11
15
script :
12
- - if [ -f requirements.yml ]; then ansible-galaxy install -r requirements.yml -p .molecule/roles/. ; fi
13
16
- molecule test
14
17
deploy :
15
18
provider : script
16
19
skip_cleanup : true
17
- script :
18
- - ./.travis/generatetag.sh
20
+ script : ./.travis/generatetag.sh
19
21
on :
20
22
branch : master
21
- # do not start when tag is added
22
- branches :
23
- only :
24
- - master
25
- tags :
26
- except :
27
- - /^\d+\.\d+\.\d+$/
28
23
notifications :
29
- webhooks : https://galaxy.ansible.com/api/v1/notifications/
30
- # after_script:
31
- # - ./.travis/notification.sh
24
+ webhooks : https://galaxy.ansible.com/api/v1/notifications/
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ galaxy_info:
4
4
description : Deploy Prometheus monitoring system
5
5
company : Sointeractive
6
6
license : MIT
7
- min_ansible_version : 2.0
7
+ min_ansible_version : 2.2
8
8
platforms :
9
9
- name : Ubuntu
10
10
versions :
Original file line number Diff line number Diff line change 1
1
---
2
2
ansible :
3
3
playbook : tests/playbook.yml
4
+ extra_vars :
5
+ version : " ${PROMETHEUS}"
4
6
driver :
5
7
name : docker
6
8
verifier :
7
9
name : testinfra
8
10
docker :
9
11
containers :
10
- - name : xenial-prometheus-legacy
12
+ - name : xenial
11
13
image : solita/ubuntu-systemd
12
14
image_version : 16.04
13
15
privileged : true
14
- ansible_groups :
15
- - legacy
16
- - name : xenial-prometheus-upstream
17
- image : solita/ubuntu-systemd
18
- image_version : 16.04
19
- privileged : true
20
- ansible_groups :
21
- - upstream
22
- - name : centos-prometheus-legacy
23
- image : centos/systemd
24
- image_version : latest
25
- privileged : true
26
- ansible_groups :
27
- - legacy
28
- - name : centos-prometheus-upstream
16
+ - name : centos
29
17
image : centos/systemd
30
18
image_version : latest
31
19
privileged : true
32
- ansible_groups :
33
- - upstream
Original file line number Diff line number Diff line change 9
9
- iproute
10
10
- net-tools
11
11
12
- - hosts : upstream
13
- pre_tasks :
14
- - name : Include vars
15
- include_vars : vars.yml
16
- roles :
17
- - ansible-prometheus
18
-
19
- - hosts : legacy
12
+ - hosts : all
20
13
pre_tasks :
21
14
- name : Include vars
22
15
include_vars : vars.yml
16
+ - name : Set prometheus version from bash PROMETHEUS variable
17
+ set_fact :
18
+ prometheus_version : " {{ version }}"
19
+ when : version is defined and version != ''
23
20
roles :
24
21
- ansible-prometheus
25
- vars :
26
- prometheus_version : 1.8.2
You can’t perform that action at this time.
0 commit comments