migrate dependencies to collections
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2020-09-25 09:43:04 +02:00
parent eaa1d315e4
commit e7a91191cb
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
10 changed files with 37 additions and 27 deletions

View File

@ -39,11 +39,9 @@ local PipelineDeployment(scenario='centos7') = {
image: 'xoxys/molecule:3', image: 'xoxys/molecule:3',
environment: { environment: {
DO_API_KEY: { from_secret: 'do_api_key' }, DO_API_KEY: { from_secret: 'do_api_key' },
MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules',
MOLECULE_CUSTOM_FILTERS_REPO: 'https://gitea.rknet.org/ansible/custom_filters',
}, },
commands: [ commands: [
'molecule test -s' + scenario, 'molecule test -s ' + scenario,
], ],
}, },
], ],

View File

@ -37,12 +37,10 @@ steps:
- name: ansible-molecule - name: ansible-molecule
image: xoxys/molecule:3 image: xoxys/molecule:3
commands: commands:
- molecule test -scentos7 - molecule test -s centos7
environment: environment:
DO_API_KEY: DO_API_KEY:
from_secret: do_api_key from_secret: do_api_key
MOLECULE_CUSTOM_FILTERS_REPO: https://gitea.rknet.org/ansible/custom_filters
MOLECULE_CUSTOM_MODULES_REPO: https://gitea.rknet.org/ansible/custom_modules
trigger: trigger:
ref: ref:
@ -146,6 +144,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 7a876570146a5dd72e330309cb65ffe39bae361432de54bd52942152d9a98514 hmac: db5dbaaf31b0b8523afc00a111d52af997dff954389577581f65cb74dbb97160
... ...

View File

@ -3,9 +3,10 @@ ansible:
custom_modules: custom_modules:
- iptables_raw - iptables_raw
- openssl_pkcs12 - openssl_pkcs12
- proxmox_kvm2 - proxmox_kvm
- ucr - ucr
- yum_versionlock - corenetworks_dns
- corenetworks_token
rules: rules:
exclude_files: exclude_files:

View File

@ -75,6 +75,8 @@ droneci_gitea_skip_verify: False
# @var droneci_http_proxy: $ "_unset_" # @var droneci_http_proxy: $ "_unset_"
# @var droneci_https_proxy: $ "_unset_" # @var droneci_https_proxy: $ "_unset_"
droneci_prometheus_anonymous_access: False
# @var droneci_no_proxy: $ ["drone-server", "drone-agent"] # @var droneci_no_proxy: $ ["drone-server", "drone-agent"]
droneci_no_proxy: [] droneci_no_proxy: []
droneci_extra_hosts: [] droneci_extra_hosts: []

View File

@ -1,16 +1,16 @@
# Standards: 0.1 # Standards: 0.1
--- ---
galaxy_info: galaxy_info:
# @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys) # @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys)
author: Robert Kaussow <mail@geeklabor.de> author: Robert Kaussow <mail@geeklabor.de>
# @meta description: > # @meta description: >
# [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.droneci) # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.droneci)
# [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.droneci?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.droneci) # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.droneci?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.droneci)
# [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.droneci/src/branch/master/LICENSE) # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.droneci/src/branch/master/LICENSE)
# #
# Setup [Drone CI](https://drone.io/) base server. Drone is a Continuous Delivery system built on container technology. # Setup [Drone CI](https://drone.io/) base server. Drone is a Continuous Delivery system built on container technology.
# Drone uses a simple YAML configuration file, a superset of docker-compose, to define and execute Pipelines inside Docker containers. # Drone uses a simple YAML configuration file, a superset of docker-compose, to define and execute Pipelines inside Docker containers.
# @end # @end
description: Setup Drone CI base server description: Setup Drone CI base server
license: MIT license: MIT
min_ansible_version: 2.8 min_ansible_version: 2.8
@ -23,3 +23,5 @@ galaxy_info:
- ci - ci
- devops - devops
dependencies: [] dependencies: []
collections:
- community.general

View File

@ -1,6 +1,9 @@
--- ---
dependency: dependency:
name: galaxy name: galaxy
options:
role-file: molecule/requirements.yml
requirements-file: molecule/requirements.yml
driver: driver:
name: delegated name: delegated
platforms: platforms:
@ -9,7 +12,7 @@ platforms:
image_id: centos-7-x64 image_id: centos-7-x64
size_id: s-1vcpu-1gb size_id: s-1vcpu-1gb
lint: | lint: |
flake8 /usr/local/bin/flake8
provisioner: provisioner:
name: ansible name: ansible
env: env:

View File

@ -1,5 +0,0 @@
---
- src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git
name: xoxys.docker_engine
scm: git
version: master

11
molecule/requirements.yml Normal file
View File

@ -0,0 +1,11 @@
---
collections:
- name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v1.2.0/xoxys-general-1.2.0.tar.gz
- name: community.general
roles:
- src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git
name: xoxys.docker_engine
scm: git
version: master

View File

@ -29,7 +29,5 @@
remove_orphans: yes remove_orphans: yes
stopped: "{{ droneci_service_stopped }}" stopped: "{{ droneci_service_stopped }}"
state: present state: present
# temp. disable changes; breaks idempotency for whatever reason
changed_when: False
become: True become: True
become_user: root become_user: root

View File

@ -41,6 +41,8 @@ services:
- DRONE_LOGS_COLOR=true - DRONE_LOGS_COLOR=true
- DRONE_LOGS_PRETTY=true - DRONE_LOGS_PRETTY=true
- DRONE_TLS_AUTOCERT=false - DRONE_TLS_AUTOCERT=false
- DRONE_DATADOG_ENABLED=false
- DRONE_PROMETHEUS_ANONYMOUS_ACCESS={{ droneci_prometheus_anonymous_access | bool | lower }}
{% if droneci_db_type == "pgsql" %} {% if droneci_db_type == "pgsql" %}
- DRONE_DATABASE_DRIVER=postgres - DRONE_DATABASE_DRIVER=postgres
- DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_db_user }}:{{ droneci_db_password }}@{{ droneci_db_server }}/{{ droneci_db_name }}?sslmode={{ droneci_db_ssl_mode }} - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_db_user }}:{{ droneci_db_password }}@{{ droneci_db_server }}/{{ droneci_db_name }}?sslmode={{ droneci_db_ssl_mode }}