From f19e937806bab01d208c448f8a166f0843c30fa5 Mon Sep 17 00:00:00 2001 From: Yuriy <51912343+ygel@users.noreply.github.com> Date: Mon, 18 Oct 2021 17:53:49 -0500 Subject: [PATCH] Rename master - main (#160) --- .ci/jobs/defaults.yml | 2 +- ...beats+master.yml => elastic+ansible-beats+main.yml} | 10 +++++++--- .github/issue_template.md | 2 +- README.md | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) rename .ci/jobs/{elastic+ansible-beats+master.yml => elastic+ansible-beats+main.yml} (75%) diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml index b06e5fd..dda016e 100644 --- a/.ci/jobs/defaults.yml +++ b/.ci/jobs/defaults.yml @@ -15,7 +15,7 @@ parameters: - string: name: branch_specifier - default: master + default: main description: the Git branch specifier to build (<branchName>, <tagName>, <commitId>, etc.) properties: diff --git a/.ci/jobs/elastic+ansible-beats+master.yml b/.ci/jobs/elastic+ansible-beats+main.yml similarity index 75% rename from .ci/jobs/elastic+ansible-beats+master.yml rename to .ci/jobs/elastic+ansible-beats+main.yml index 5d18f0f..b1801ff 100644 --- a/.ci/jobs/elastic+ansible-beats+master.yml +++ b/.ci/jobs/elastic+ansible-beats+main.yml @@ -1,8 +1,12 @@ --- - job: - name: elastic+ansible-beats+master - display-name: elastic / ansible-beats - master - description: Master branch testing with test kitchen + name: elastic+ansible-beats+main + display-name: elastic / ansible-beats - main + description: Main branch testing with test kitchen + scm: + - git: + branches: + - refs/heads/main triggers: - timed: H H(02-04) * * * builders: diff --git a/.github/issue_template.md b/.github/issue_template.md index e381433..0dddbd0 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -26,7 +26,7 @@ Issues that do not follow these guidelines are likely to be closed. **Beats version** -**Role version**: (If using master please specify github sha) +**Role version**: (If using main please specify github sha) **OS version** (`uname -a` if on a Unix-like system): diff --git a/README.md b/README.md index 731343f..ee8cb6d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ansible-beats -[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-beats+master.svg)](https://devops-ci.elastic.co/job/elastic+ansible-beats+master/) +[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-beats+main.svg)](https://devops-ci.elastic.co/job/elastic+ansible-beats+main/) [![Ansible Galaxy](https://img.shields.io/badge/ansible--galaxy-elastic.beats-blue.svg)](https://galaxy.ansible.com/elastic/beats/) This role provides a generic means of installing Elastic supported Beats @@ -59,8 +59,8 @@ The simplest configuration therefore consists of: The above installs Filebeat 7.15.1 on the hosts 'localhost'. **Notes**: -- Beats default version is described in [`beats_version`](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4). You can override this variable in your playbook to install another version. -While we are testing this role only with one 7.x and one 6.x version (respectively [7.15.1](https://github.com/elastic/ansible-beats/blob/master/defaults/main.yml#L4) and [6.8.18](https://github.com/elastic/ansible-beats/blob/master/test/integration/standard-6x.yml#L7) at the time of writing), this role should work with others version also in most cases. +- Beats default version is described in [`beats_version`](https://github.com/elastic/ansible-beats/blob/main/defaults/main.yml#L4). You can override this variable in your playbook to install another version. +While we are testing this role only with one 7.x and one 6.x version (respectively [7.15.1](https://github.com/elastic/ansible-beats/blob/main/defaults/main.yml#L4) and [6.8.18](https://github.com/elastic/ansible-beats/blob/main/test/integration/standard-6x.yml#L7) at the time of writing), this role should work with others version also in most cases. - Beat product is described in `beat` variable. While currently tested Beats are Filebeat, Metricbeat & Packetbeat, this role should work also with other member of [The Beats Family](https://www.elastic.co/products/beats) in most cases. ## Testing