From 9fd86ddca7d1b1c12a4d6e9d14839e6ade8a9ecd Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 19 Aug 2020 18:39:04 +0200 Subject: [PATCH] migrate dependencies to collections --- .drone.jsonnet | 4 +--- .drone.yml | 6 ++---- .later.yml | 7 ++++--- meta/main.yml | 20 +++++++++++--------- molecule/centos7/molecule.yml | 5 ++++- molecule/centos7/requirements.yml | 5 ----- molecule/requirements.yml | 11 +++++++++++ tasks/setup.yml | 2 -- 8 files changed, 33 insertions(+), 27 deletions(-) delete mode 100644 molecule/centos7/requirements.yml create mode 100644 molecule/requirements.yml diff --git a/.drone.jsonnet b/.drone.jsonnet index f87c22c..eb8a217 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -39,11 +39,9 @@ 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, + 'molecule test -s ' + scenario, ], }, ], diff --git a/.drone.yml b/.drone.yml index 6c381e4..27de7e5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,12 +37,10 @@ steps: - name: ansible-molecule image: xoxys/molecule:3 commands: - - molecule test -scentos7 + - molecule test -s centos7 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: 67b5cf59b21ec7a714d48e9d670a2ee3b93b49ff80c73ed89a8086cf70aef29a +hmac: 95b93fe58db98b9fcf4ef346286e1f9956efd6a8e0b9bcbd85150a0f786b01fe ... diff --git a/.later.yml b/.later.yml index 45911c9..0efe5d5 100644 --- a/.later.yml +++ b/.later.yml @@ -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: @@ -13,6 +14,6 @@ rules: - "LICENSE*" - "**/*.md" - "**/*.ini" - + exclude_filter: - LINT0009 diff --git a/meta/main.yml b/meta/main.yml index db9131f..76fc276 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,16 +1,16 @@ # Standards: 0.1 --- 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 -# @meta description: > -# [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.freshrss_docker) -# [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.freshrss_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.freshrss_docker) -# [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.freshrss_docker/src/branch/master/LICENSE) -# -# Setup [FreshRSS](https://freshrss.org/) server. FreshRSS is a self-hosted RSS feed aggregator. -# It is lightweight, easy to work with, powerful, and customizable. -# @end + # @meta description: > + # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.freshrss_docker) + # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.freshrss_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.freshrss_docker) + # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.freshrss_docker/src/branch/master/LICENSE) + # + # Setup [FreshRSS](https://freshrss.org/) server. FreshRSS is a self-hosted RSS feed aggregator. + # It is lightweight, easy to work with, powerful, and customizable. + # @end description: Setup FreshRSS server license: MIT min_ansible_version: 2.8 @@ -23,3 +23,5 @@ galaxy_info: - news - freshrss dependencies: [] +collections: + - community.general diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml index f9f5ef2..17f88a9 100644 --- a/molecule/centos7/molecule.yml +++ b/molecule/centos7/molecule.yml @@ -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: diff --git a/molecule/centos7/requirements.yml b/molecule/centos7/requirements.yml deleted file mode 100644 index 0ce02a2..0000000 --- a/molecule/centos7/requirements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git - name: xoxys.docker_engine - scm: git - version: master diff --git a/molecule/requirements.yml b/molecule/requirements.yml new file mode 100644 index 0000000..ec52293 --- /dev/null +++ b/molecule/requirements.yml @@ -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 diff --git a/tasks/setup.yml b/tasks/setup.yml index 4aa99ed..927b807 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -22,7 +22,5 @@ remove_orphans: yes stopped: "{{ freshrss_service_stopped }}" state: present - # temp. disable changes; breaks idempotency for whatever reason - changed_when: False become: True become_user: root