From e7a91191cb59fec539da16d51b68bcc4143f61e7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 25 Sep 2020 09:43:04 +0200 Subject: [PATCH] migrate dependencies to collections --- .drone.jsonnet | 4 +--- .drone.yml | 6 ++---- .later.yml | 7 ++++--- defaults/main.yml | 2 ++ meta/main.yml | 20 +++++++++++--------- molecule/centos7/molecule.yml | 5 ++++- molecule/centos7/requirements.yml | 5 ----- molecule/requirements.yml | 11 +++++++++++ tasks/setup.yml | 2 -- templates/services/droneci_compose.yml.j2 | 2 ++ 10 files changed, 37 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 360b2be..c0d4aff 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: 7a876570146a5dd72e330309cb65ffe39bae361432de54bd52942152d9a98514 +hmac: db5dbaaf31b0b8523afc00a111d52af997dff954389577581f65cb74dbb97160 ... 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/defaults/main.yml b/defaults/main.yml index a640e29..4a4c933 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -75,6 +75,8 @@ droneci_gitea_skip_verify: False # @var droneci_http_proxy: $ "_unset_" # @var droneci_https_proxy: $ "_unset_" +droneci_prometheus_anonymous_access: False + # @var droneci_no_proxy: $ ["drone-server", "drone-agent"] droneci_no_proxy: [] droneci_extra_hosts: [] diff --git a/meta/main.yml b/meta/main.yml index d5b3f09..4b3a065 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.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) -# -# 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. -# @end + # @meta description: > + # [![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) + # [![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. + # Drone uses a simple YAML configuration file, a superset of docker-compose, to define and execute Pipelines inside Docker containers. + # @end description: Setup Drone CI base server license: MIT min_ansible_version: 2.8 @@ -23,3 +23,5 @@ galaxy_info: - ci - devops dependencies: [] +collections: + - community.general diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml index 6a980d5..c908280 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..5fec40e --- /dev/null +++ b/molecule/requirements.yml @@ -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 diff --git a/tasks/setup.yml b/tasks/setup.yml index 7520ac0..ad79d6b 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -29,7 +29,5 @@ remove_orphans: yes stopped: "{{ droneci_service_stopped }}" state: present - # temp. disable changes; breaks idempotency for whatever reason - changed_when: False become: True become_user: root diff --git a/templates/services/droneci_compose.yml.j2 b/templates/services/droneci_compose.yml.j2 index a51e79e..dffd74f 100644 --- a/templates/services/droneci_compose.yml.j2 +++ b/templates/services/droneci_compose.yml.j2 @@ -41,6 +41,8 @@ services: - DRONE_LOGS_COLOR=true - DRONE_LOGS_PRETTY=true - DRONE_TLS_AUTOCERT=false + - DRONE_DATADOG_ENABLED=false + - DRONE_PROMETHEUS_ANONYMOUS_ACCESS={{ droneci_prometheus_anonymous_access | bool | lower }} {% if droneci_db_type == "pgsql" %} - 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 }}