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

This commit is contained in:
Robert Kaussow 2020-08-19 18:39:06 +02:00
parent 20c5a8a77c
commit c347a0d711
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
8 changed files with 38 additions and 32 deletions

View File

@ -39,8 +39,6 @@ local PipelineDeployment(scenario='centos7') = {
image: 'xoxys/molecule:3',
environment: {
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: [
'molecule test -s ' + scenario,

View File

@ -41,8 +41,6 @@ steps:
environment:
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:
ref:
@ -146,6 +144,6 @@ depends_on:
---
kind: signature
hmac: c0340a399cac04f59310a7c888ad60ccfd8aa8a2b742c8eafac01c38237c7878
hmac: 71a2d2321b3783336bef59723e254c6ec405d5144fb40291bba5eb70ed631792
...

View File

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

View File

@ -24,3 +24,5 @@ galaxy_info:
- password
- save
dependencies: []
collections:
- community.general

View File

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

View File

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

16
molecule/requirements.yml Normal file
View File

@ -0,0 +1,16 @@
---
collections:
- name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v1.1.0/xoxys-general-1.1.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
- src: https://gitea.rknet.org/ansible/xoxys.postgres.git
name: xoxys.postgres
scm: git
version: master

View File

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