From bd78efb905fc73921a9793d1c72032ddea862036 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Fri, 2 Apr 2021 08:35:10 +0200 Subject: [PATCH] Find the first letter of the role, not the first letter of "ansible". --- gitlab.yml | 6 +++- templates/README.md.j2 | 2 +- vars/main.yml | 70 +++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/gitlab.yml b/gitlab.yml index f0f7dac..158e265 100755 --- a/gitlab.yml +++ b/gitlab.yml @@ -55,6 +55,10 @@ protects: true masked: true + - name: show details + debug: + msg: "Scheduling {{ role }} on {{ letter_minute_mapping[role[13]] }} {{ letter_hour_mapping[role[13]] }} {{ letter_day_mapping[role[13]] }} * *" + - name: create a new pipeline schedule uri: url: "https://gitlab.com/api/v4/projects/{{ encoded_path }}/pipeline_schedules" @@ -67,5 +71,5 @@ body: description: "Monthly test" ref: master - cron: '{{ letter_minute_mapping[role[0]] }} {{ letter_hour_mapping[role[0]] }} {{ letter_day_mapping[role[0]] }} * *' + cron: '{{ letter_minute_mapping[role[13]] }} {{ letter_hour_mapping[role[13]] }} {{ letter_day_mapping[role[13]] }} * *' cron_timezone: Amsterdam diff --git a/templates/README.md.j2 b/templates/README.md.j2 index ce6b180..e7c72c6 100644 --- a/templates/README.md.j2 +++ b/templates/README.md.j2 @@ -40,7 +40,7 @@ The following roles are used to prepare a system. You may choose to prepare your | Requirement | GitHub | GitLab | |-------------|--------|--------| {% for requirement in requirements.roles %} -| [{{ requirement.name }}](https://galaxy.ansible.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.') }}) | [![Build Status GitHub](https://github.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/workflows/Ansible%20Molecule/badge.svg)](https://github.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/actions) | [![Build Status GitLab ](https://gitlab.com/{{ github_namespace }}/ansible-role-{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/badges/master/pipeline.svg)](https://gitlab.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}) +|[{{ requirement.name }}](https://galaxy.ansible.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.') }})|[![Build Status GitHub](https://github.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/workflows/Ansible%20Molecule/badge.svg)](https://github.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/actions)|[![Build Status GitLab ](https://gitlab.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/badges/master/pipeline.svg)](https://gitlab.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }})| {% endfor %} {% endif %} diff --git a/vars/main.yml b/vars/main.yml index 4640a44..d25fb9a 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -166,38 +166,38 @@ letter_hour_mapping: letter_minute_mapping: a: 1 - b: 2 - c: 3 - d: 4 - e: 5 - f: 6 - g: 7 - h: 8 - i: 9 - j: 10 - k: 11 - l: 12 - m: 13 - n: 14 - o: 15 - p: 16 - q: 17 - r: 18 - s: 19 - t: 20 - u: 21 - v: 23 - w: 24 - x: 25 - y: 26 - z: 27 - 0: 28 - 1: 29 - 2: 30 - 3: 31 - 4: 32 - 5: 33 - 6: 34 - 7: 35 - 8: 36 - 9: 37 + b: 3 + c: 5 + d: 7 + e: 9 + f: 11 + g: 13 + h: 15 + i: 17 + j: 19 + k: 21 + l: 23 + m: 25 + n: 27 + o: 29 + p: 31 + q: 33 + r: 35 + s: 37 + t: 39 + u: 41 + v: 43 + w: 45 + x: 47 + y: 49 + z: 51 + 0: 53 + 1: 55 + 2: 57 + 3: 59 + 4: 59 + 5: 59 + 6: 59 + 7: 59 + 8: 59 + 9: 59