From 499a3cf76dd9db4f04c07bf4711edb637f8d2f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Tue, 24 May 2022 07:53:54 +0200 Subject: [PATCH] Ensure we create correct job names with role-addition.yml Since I21dd3741b54ed434e16d89db03e4e37ea093eabb, molecule jobs are now based on "centos-stream" and not "centos-8" anymore. This patch ensures the automation as well as the contribution doc are reflecting this new state. Change-Id: I5cafac6d6fb2da351c0aa8ffffc6b4349e4c59bf --- doc/source/contributing_roles.rst | 8 ++++---- role-addition.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/contributing_roles.rst b/doc/source/contributing_roles.rst index 2f6cfc0cc..d8811c971 100644 --- a/doc/source/contributing_roles.rst +++ b/doc/source/contributing_roles.rst @@ -22,8 +22,8 @@ When the role is ready for CI, add a **job** entry into the - job: files: - ^tripleo_ansible/roles/${NEWROLENAME}/.* - name: tripleo-ansible-centos-8-molecule-${NEWROLENAME} - parent: tripleo-ansible-centos-8-base + name: tripleo-ansible-centos-stream-molecule-${NEWROLENAME} + parent: tripleo-ansible-centos-stream-base vars: tox_envlist: mol-${NEWROLENAME} @@ -36,10 +36,10 @@ of the `molecule.yaml` file. - project: check: jobs: - - tripleo-ansible-centos-8-molecule-${NEWROLENAME} + - tripleo-ansible-centos-stream-molecule-${NEWROLENAME} gate: jobs: - - tripleo-ansible-centos-8-molecule-${NEWROLENAME} + - tripleo-ansible-centos-stream-molecule-${NEWROLENAME} Finally add a role documentation file at diff --git a/role-addition.yml b/role-addition.yml index 9e44eb786..c380fde4d 100755 --- a/role-addition.yml +++ b/role-addition.yml @@ -52,7 +52,7 @@ --- {% set items = molecule_yaml['content'] | b64decode | from_yaml %} {% set job_index = [] %} - {% set new_job_name = "tripleo-ansible-centos-8-molecule-" ~ _role_name %} + {% set new_job_name = "tripleo-ansible-centos-stream-molecule-" ~ _role_name %} {% for item in items %} {% if 'project-template' in item %} {% if item['project-template']['name'] == "tripleo-ansible-molecule-jobs" %} @@ -81,7 +81,7 @@ {% if (job_index | length) < 1 %} {% set new_job = { "name": new_job_name, - "parent": "tripleo-ansible-centos-8-base", + "parent": "tripleo-ansible-centos-stream-base", "files": [ "^tripleo_ansible/roles/" ~ _role_name ~ "/(?!meta).*" ],