From dc0503b699bc0fe529a8ca72216b18b0a093be0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Thu, 30 Jun 2022 15:59:35 +0200
Subject: [PATCH] CI: Hardcode the artifacts path in the generated job
description
Some gitlab update(?) seem to have changed the behaviour in
variable passing. In the scripts the variables are available
but in the artifacts path does not resolve them any more.
May be it has something to do with the introduction of the
trigger:forward keyword.
---
build-jobs-yocto.jinja2 | 7 +++++++
manifest-build.yml | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build-jobs-yocto.jinja2 b/build-jobs-yocto.jinja2
index 9a616aed..ab99b260 100644
--- a/build-jobs-yocto.jinja2
+++ b/build-jobs-yocto.jinja2
@@ -71,6 +71,10 @@ build-{{ machine }}:
CI_PARAM_MACHINE: {{ machine }}
CI_PARAM_DISTRO: {{ CI_PARAM_DISTRO }}
CI_PARAM_IMAGE: {{ CI_PARAM_IMAGE }}
+ artifacts:
+ paths:
+ - build-{{ CI_PARAM_DISTRO }}-{{ machine }}/tmp/deploy/images/{{ machine }}/*
+ - build-{{ CI_PARAM_DISTRO }}-{{ machine }}/tmp/deploy/licenses/**/license.manifest
# Build jobs for the sdk
buildsdk-{{ machine }}:
@@ -80,6 +84,9 @@ buildsdk-{{ machine }}:
CI_PARAM_MACHINE: {{ machine }}
CI_PARAM_DISTRO: {{ CI_PARAM_DISTRO }}
CI_PARAM_IMAGE: {{ CI_PARAM_IMAGE }}
+ artifacts:
+ paths:
+ - build-{{ CI_PARAM_DISTRO }}-{{ machine }}/tmp/deploy/sdk/*
# Deploy jobs for the yocto image
deployimage-{{ machine }}:
diff --git a/manifest-build.yml b/manifest-build.yml
index 430d701a..12967359 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -112,9 +112,6 @@ variables:
- *collect_srcrevs
- *dump_install_command
artifacts:
- paths:
- - "${BUILDPATH}/${IMAGEPATH}/*"
- - "${BUILDPATH}/${LICENSESPATH}/**/license.manifest"
reports:
dotenv: build.env
@@ -173,9 +170,6 @@ variables:
- when: manual
variables:
BITBAKE_TASK: "populate_sdk"
- artifacts:
- paths:
- - "${BUILDPATH}/${SDKPATH}/*"
# ---------------------------------------------------------------------------------------
# Stage: test
--
GitLab