From 6f05c562b83a5b1be2f3927a97c6774b2b0ec6f6 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Mar 31 2020 13:57:43 +0000 Subject: Add src_name override support to rpm-mock-build job If the specfile base name differs than the source name. Specify src_name. This is useful when build_from_source is set and discovered source name is failing leading to a %prep phase failure. --- diff --git a/roles/source-to-tarball/tasks/main.yaml b/roles/source-to-tarball/tasks/main.yaml index e063386..d7d7bee 100644 --- a/roles/source-to-tarball/tasks/main.yaml +++ b/roles/source-to-tarball/tasks/main.yaml @@ -48,7 +48,7 @@ command: > tar -czf /tmp/HEAD.tgz --exclude .git - --transform s/^{{ zuul.project.src_dir|basename }}/{{ package_name }}-{{ source_version }}/ + --transform s/^{{ zuul.project.src_dir|basename }}/{{ src_name|default(package_name) }}-{{ source_version }}/ {{ zuul.project.src_dir|basename }} args: chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/.." diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5c4d6fd..31dfc08 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -24,6 +24,14 @@ Using or not the version detected from the specfile. + .. zuul:jobvar:: src_name + : default: specfile base name + + If the specfile base name differs than the source + name. Specify src_name. This is useful when + build_from_source is set and discovered source + name is failing leading to a %prep phase failure. + .. zuul:jobvar:: repos : default: []