aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kletzander <mkletzan@redhat.com>2022-05-27 12:21:47 +0200
committerMartin Kletzander <mkletzan@redhat.com>2022-05-27 12:21:47 +0200
commitf2a3ed2152eedbd6913da02e05c0d54d0bd0db7e (patch)
treefbcfeb8292826005a843e6f1b87d61aa8c1e0cb4
parent0bb8db80f037a2582476f3cde0ac3765993f385f (diff)
downloadlibvirt-ci-f2a3ed2152eedbd6913da02e05c0d54d0bd0db7e.zip
libvirt-ci-f2a3ed2152eedbd6913da02e05c0d54d0bd0db7e.tar.gz
libvirt-ci-f2a3ed2152eedbd6913da02e05c0d54d0bd0db7e.tar.bz2
Use absolute paths for includes
Since the paths are included from a subdirectory the relative path does not exist, so either we need to remove the subdirectory or make the path absolute. Since the path already exists and we do not want to mess with that the latter approach seems more straightforward. Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-rw-r--r--guests/lcitool/lcitool/gitlab.py2
-rw-r--r--guests/lcitool/tests/data/manifest/out/ci/gitlab.yml10
2 files changed, 6 insertions, 6 deletions
diff --git a/guests/lcitool/lcitool/gitlab.py b/guests/lcitool/lcitool/gitlab.py
index 7a58c92..8bcb8f7 100644
--- a/guests/lcitool/lcitool/gitlab.py
+++ b/guests/lcitool/lcitool/gitlab.py
@@ -8,7 +8,7 @@ import textwrap
def includes(paths):
- lines = [f" - local: '{path}'" for path in paths]
+ lines = [f" - local: '/{path}'" for path in paths]
return "include:\n" + "\n".join(lines)
diff --git a/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml b/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml
index 79a967f..8f56d17 100644
--- a/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml
+++ b/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml
@@ -1,6 +1,6 @@
include:
- - local: 'ci/gitlab/container-templates.yml'
- - local: 'ci/gitlab/build-templates.yml'
- - local: 'ci/gitlab/sanity-checks.yml'
- - local: 'ci/gitlab/containers.yml'
- - local: 'ci/gitlab/builds.yml'
+ - local: '/ci/gitlab/container-templates.yml'
+ - local: '/ci/gitlab/build-templates.yml'
+ - local: '/ci/gitlab/sanity-checks.yml'
+ - local: '/ci/gitlab/containers.yml'
+ - local: '/ci/gitlab/builds.yml'