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:04 +02:00
parent 0d06fcac97
commit 9fd86ddca7
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
8 changed files with 33 additions and 27 deletions

View File

@ -39,8 +39,6 @@ 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

@ -41,8 +41,6 @@ steps:
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: 67b5cf59b21ec7a714d48e9d670a2ee3b93b49ff80c73ed89a8086cf70aef29a hmac: 95b93fe58db98b9fcf4ef346286e1f9956efd6a8e0b9bcbd85150a0f786b01fe
... ...

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

@ -23,3 +23,5 @@ galaxy_info:
- news - news
- freshrss - freshrss
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.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

View File

@ -22,7 +22,5 @@
remove_orphans: yes remove_orphans: yes
stopped: "{{ freshrss_service_stopped }}" stopped: "{{ freshrss_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