From 0fbb2f7390c82f6d3bab0954ff33cde1104d9381 Mon Sep 17 00:00:00 2001 From: Enrique Vallespi Gil Date: Tue, 17 Mar 2026 11:24:40 +0100 Subject: [PATCH] [repo_setup] Add version for repo_setup repo pull action We're adding a new cifmw_repo_setup_version variable where defaults to main but can be overriden for selecting a version/tag of the repo to be pulled. It accepts: branch, tags and commit SHA. Signed-off-by: Enrique Vallespi Gil Signed-off-by: Enrique Vallespi Gil --- roles/repo_setup/README.md | 1 + roles/repo_setup/defaults/main.yml | 1 + roles/repo_setup/tasks/install.yml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/repo_setup/README.md b/roles/repo_setup/README.md index 6b7f41657f..88d366c0a3 100644 --- a/roles/repo_setup/README.md +++ b/roles/repo_setup/README.md @@ -19,6 +19,7 @@ using `cifmw_repo_setup_src` role default var. * `cifmw_repo_setup_rdo_mirror`: (String) Address from which to install RDO packages. Defaults to `{{ cifmw_repo_setup_dlrn_uri }}`. * `cifmw_repo_setup_os_release`: (String) Operating system release. Defaults to `{{ ansible_distribution|lower }}`. * `cifmw_repo_setup_src`: (String) repo-setup repository location. Defaults to `https://github.com/openstack-k8s-operators/repo-setup`. +* `cifmw_repo_setup_version`: (string) repo-setup repository version. Defaults to `HEAD`. * `cifmw_repo_setup_output`: (String) Repository files output. Defaults to `{{ cifmw_repo_setup_basedir }}/artifacts/repositories`. * `cifmw_repo_setup_additional_repos`: (String) Additional repos(ceph, deps) to enable. Defaults to `''`. * `cifmw_repo_setup_env`: (Dict) Environment variables to be passed to repo_setup cli . Defaults to `'{}'`. diff --git a/roles/repo_setup/defaults/main.yml b/roles/repo_setup/defaults/main.yml index 5929b16e41..4204e713db 100644 --- a/roles/repo_setup/defaults/main.yml +++ b/roles/repo_setup/defaults/main.yml @@ -28,6 +28,7 @@ cifmw_repo_setup_rdo_mirror: "{{ cifmw_repo_setup_dlrn_uri }}" cifmw_repo_setup_os_release: "{{ ansible_distribution | lower }}" cifmw_repo_setup_dist_major_version: "{{ ansible_distribution_major_version }}" cifmw_repo_setup_src: "https://github.com/openstack-k8s-operators/repo-setup" +cifmw_repo_setup_version: "HEAD" cifmw_repo_setup_output: "{{ cifmw_repo_setup_basedir }}/artifacts/repositories" cifmw_repo_setup_env: {} cifmw_repo_setup_additional_repos: '' diff --git a/roles/repo_setup/tasks/install.yml b/roles/repo_setup/tasks/install.yml index e47676adeb..7eff742c0c 100644 --- a/roles/repo_setup/tasks/install.yml +++ b/roles/repo_setup/tasks/install.yml @@ -18,11 +18,12 @@ - packages - bootstrap -- name: Get repo-setup repository # noqa: latest[git] +- name: Get repo-setup repository ansible.builtin.git: accept_hostkey: true dest: "{{ cifmw_repo_setup_basedir }}/tmp/repo-setup" repo: "{{ cifmw_repo_setup_src }}" + version: "{{ cifmw_repo_setup_version }}" - name: Initialize python venv and install requirements ansible.builtin.pip: