From 8599e0f1f1cb98351d9376fda6c155bc694f7db5 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 20 Jun 2022 22:20:51 +0200 Subject: [PATCH] chore: switch to main as default branch --- .drone.jsonnet | 10 +++++----- .drone.yml | 12 ++++++------ meta/main.yml | 2 +- molecule/rocky8/converge.yml | 4 ++++ tasks/setup.yml | 6 ++++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0f3b5c4..2f061dd 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -37,7 +37,7 @@ local PipelineLinting = { }, ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -71,7 +71,7 @@ local PipelineDeployment(scenario='rocky8') = { 'linting', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, }; @@ -107,12 +107,12 @@ local PipelineDocumentation = { target_branch: 'docs', }, when: { - ref: ['refs/heads/master'], + ref: ['refs/heads/main'], }, }, ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, depends_on: [ 'testing-rocky8', @@ -147,7 +147,7 @@ local PipelineNotification = { ], trigger: { status: ['success', 'failure'], - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, }; diff --git a/.drone.yml b/.drone.yml index df36df4..a1cd33a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -60,7 +60,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: @@ -98,11 +98,11 @@ steps: from_secret: gitea_username when: ref: - - refs/heads/master + - refs/heads/main trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -136,7 +136,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** status: - success @@ -147,6 +147,6 @@ depends_on: --- kind: signature -hmac: f38c44313242ea29b9e64da58f382de0f5d4354a8dc193c96efe4696eecb090b +hmac: a4095daa53c853917448028c7e0bbe34456662702cc8b4b4686e0a5fe730e6ec ... diff --git a/meta/main.yml b/meta/main.yml index 8dba28d..71f42d0 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,7 +8,7 @@ galaxy_info: # @meta description: > # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.podman) # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.podman?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.podman) - # [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](https://gitea.rknet.org/ansible/xoxys.podman/src/branch/master/LICENSE) + # [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](https://gitea.rknet.org/ansible/xoxys.podman/src/branch/main/LICENSE) # # Setup Podman container manager. # @end diff --git a/molecule/rocky8/converge.yml b/molecule/rocky8/converge.yml index 55d03a4..3c1bac1 100644 --- a/molecule/rocky8/converge.yml +++ b/molecule/rocky8/converge.yml @@ -1,5 +1,9 @@ --- - name: Converge hosts: all + vars: + kernel_cgroup_v2_enabled: True + kernel_ipv4_ping_group_range: "0 2000000" roles: + - role: xoxys.kernel - role: xoxys.podman diff --git a/tasks/setup.yml b/tasks/setup.yml index 488313e..af96456 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -10,6 +10,12 @@ - fuse-overlayfs - crun - container-selinux + - bash-completion + + - name: Install Podman bash-completion + command: + cmd: "podman completion bash -f /etc/bash_completion.d/podman" + creates: "/etc/bash_completion.d/podman" - name: Deploy container configuration template: