Skip to content

Commit 1dd4dda

Browse files
authored
Ansible2.10 (#23)
* Add ansible-lint corrections * Test ansible 2.10 * Add collection community.mysql * Add requirements-file * Remove library * Update README and meta Signed-off-by: tgadiev <[email protected]>
1 parent 8f71b43 commit 1dd4dda

File tree

18 files changed

+614
-447
lines changed

18 files changed

+614
-447
lines changed

.ansible-lint

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ exclude_paths:
44
rulesdir:
55
- ~/ansible-lint-rules/rules/
66
use_default_rules: true
7-
verbosity: 1
7+
verbosity: 1
8+
offline: true

.gitlab-ci.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ Lint:
3737
tags:
3838
- aws
3939

40-
AWS mysql 5.7:
40+
AWS mysql 5.7 ansible-2.10:
41+
image:
42+
name: $AWS_ECR_REPO/docker-ansible-ci:ansible-2.10
4143
variables:
4244
AWS_REGION: us-east-1
4345
stage: deployment test
@@ -64,16 +66,9 @@ AWS mysql 5.5:
6466
tags:
6567
- aws
6668

67-
AWS mysql mariadb:
68-
variables:
69-
AWS_REGION: us-east-1
70-
stage: deployment test
71-
script:
72-
- molecule test -s cloud-aws-direct-mariadb
73-
tags:
74-
- aws
75-
76-
AWS mysql-8.0:
69+
AWS mysql-8.0 ansible-2.10:
70+
image:
71+
name: $AWS_ECR_REPO/docker-ansible-ci:ansible-2.10
7772
variables:
7873
AWS_REGION: us-east-1
7974
stage: deployment test
@@ -82,13 +77,13 @@ AWS mysql-8.0:
8277
tags:
8378
- aws
8479

85-
.AWS mysql-8.0 ansible 2.10:
80+
AWS mariadb ansible 2.10:
8681
image:
8782
name: $AWS_ECR_REPO/docker-ansible-ci:ansible-2.10
8883
variables:
8984
AWS_REGION: us-east-1
9085
stage: deployment test
9186
script:
92-
- molecule test -s cloud-aws-direct-8.0
87+
- molecule test -s cloud-aws-direct-mariadb
9388
tags:
9489
- aws

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Ansible Role: MySQL
22
[![License](https://img.shields.io/badge/license-Apache-green.svg?style=flat)](https://raw.githubusercontent.com/lean-delivery/ansible-role-mysql/master/LICENSE)
3-
[![Build Status](https://travis-ci.org/lean-delivery/ansible-role-mysql.svg?branch=master)](https://travis-ci.org/lean-delivery/ansible-role-mysql)
43
[![Build status](https://gitlab.com/lean-delivery/ansible-role-mysql/badges/master/pipeline.svg)](https://gitlab.com/lean-delivery/ansible-role-mysql/-/commits/master)
54
[![Galaxy](https://img.shields.io/badge/galaxy-lean__delivery.mysql-blue.svg)](https://galaxy.ansible.com/lean_delivery/mysql)
65
![Ansible](https://img.shields.io/ansible/role/d/35413.svg)
@@ -63,7 +62,14 @@ If you want to select a specific minor version of package, you can enter appropr
6362
mysql_packages:
6463
- mysql-community-server-8.0.16-2.el7.x86_64
6564
- mysql-community-client-8.0.16-2.el7.x86_64
65+
66+
Alternatively, you can define the packages as a list of external urls by setting the variable `mysql_artifacts`, e.g.:
67+
68+
mysql_artifacts:
69+
- https://downloads.mysql.com/archives/get/p/23/file/mysql-community-client_5.7.31-1ubuntu18.04_amd64.deb
70+
- https://downloads.mysql.com/archives/get/p/23/file/mysql-community-server_5.7.31-1ubuntu18.04_amd64.deb
6671
72+
### NOTE: *This option was tested only for deb-based packages at the moment.*
6773
# (MariaDB-common)
6874
mysql_daemon: mysqld # (mysqld/mariadb)
6975
mysql_version: 5.7 # (for mysql = 5.5/5.6/5.7; for mariadb = last (10.5) )

library/listen_ports_facts.py

Lines changed: 0 additions & 241 deletions
This file was deleted.

meta/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ galaxy_info:
1414
- 8
1515
- name: Ubuntu
1616
versions:
17-
- xenial
1817
- bionic
1918
- name: Debian
2019
versions:
@@ -39,3 +38,5 @@ galaxy_info:
3938
- db
4039
- sql
4140
dependencies: []
41+
collections:
42+
- community.mysql

molecule/cloud-aws-direct-5.5/molecule.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
dependency:
33
name: galaxy
44
options:
5-
role-file: requirements.yml
5+
requirements-file: requirements.yml
6+
collections-path: ~/.ansible/collections
67
driver:
78
name: ec2
89
lint: ansible-lint
910
platforms:
1011
- name: test-aws-centos7-mysql-5.5
11-
image: ami-9887c6e7
1212
platform: centos7
1313
instance_type: m5.large
1414
region: us-east-1
@@ -21,6 +21,7 @@ platforms:
2121
ssh_user: centos
2222
groups:
2323
- rhel_family
24+
- rhel7
2425

2526
provisioner:
2627
name: ansible
@@ -32,6 +33,7 @@ provisioner:
3233
create: ../resources/provisioning/AWS/create.yml
3334
destroy: ../resources/provisioning/AWS/destroy.yml
3435
verify: ../resources/tests/verify.yml
36+
prepare: ../resources/prepare.yml
3537
lint:
3638
name: ansible-lint
3739
scenario:

0 commit comments

Comments
 (0)