From 40f06bf4c6466790709cf60f1caf5bfd150958cb Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Sat, 1 Jun 2024 21:12:19 +0200 Subject: [PATCH] Fix versions in run.sh if version = latest/main Signed-off-by: Christian Berendt --- src/set-versions.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/set-versions.py b/src/set-versions.py index 77db38a..e19be83 100644 --- a/src/set-versions.py +++ b/src/set-versions.py @@ -32,6 +32,12 @@ playbooks_manager = versions.get("manager_playbooks_version", "main") services_version = versions["ansible_collections"]["osism.services"] +if commons_version != "main": + commons_version = f"v{commons_version}" + +if services_version != "main": + services_version = f"v{services_version}" + # manage generics version in gilt.yml if MANAGER_VERSION == "latest" or Version(MANAGER_VERSION) >= Version("7.0.3"): @@ -56,12 +62,12 @@ data = fp.read() data = re.sub( "ANSIBLE_COLLECTION_COMMONS_VERSION=.*", - f"ANSIBLE_COLLECTION_COMMONS_VERSION=${{ANSIBLE_COLLECTION_COMMONS_VERSION:-v{commons_version}}}", + f"ANSIBLE_COLLECTION_COMMONS_VERSION=${{ANSIBLE_COLLECTION_COMMONS_VERSION:-{commons_version}}}", data, ) data = re.sub( "ANSIBLE_COLLECTION_SERVICES_VERSION=.*", - f"ANSIBLE_COLLECTION_SERVICES_VERSION=${{ANSIBLE_COLLECTION_SERVICES_VERSION:-v{services_version}}}", + f"ANSIBLE_COLLECTION_SERVICES_VERSION=${{ANSIBLE_COLLECTION_SERVICES_VERSION:-{services_version}}}", data, ) data = re.sub(