From ba0d1dbcb95c879dceb7ab8f6f9a68dddfd7d79f Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Wed, 23 Nov 2022 09:04:12 +0100
Subject: [PATCH] Fix of missing variables in manifest pipeline
* Variables fundamental for build and deploy stage included
* Fix on project trigger name for ci-test
---
.gitlab-ci.yml | 10 ----------
build-jobs-ci-test.yml.jinja2 | 2 +-
manifest-integration-jobs.yml.jinja2 | 6 +++---
manifest-integration-pipelines.yml.jinja2 | 4 ++--
manifest-pipeline-yocto.yml | 15 +++++++++++++--
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27c2e9d..17e9d4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,16 +75,6 @@ executable:
MERGE: ""
script:
- cd ${CI_PROJECT_DIR}
- - echo
- - echo ${CI_SERVER_URL}
- - echo ${GITBOT_TOKEN}
- - echo ${MANIFEST_PROJECT}
- - echo ${MANIFEST_BRANCH}
- - echo ${CI_COMMIT_SHA}
- - echo ${PROJECT_GROUP}
- - echo ${MERGE}
- - echo ${CI_PROJECT_NAME}
- - echo ${CI_COMMIT_REF_NAME}
- scripts/deploy_gitlab_ci.py
--gitlab-url=${CI_SERVER_URL}
--token=${GITBOT_TOKEN}
diff --git a/build-jobs-ci-test.yml.jinja2 b/build-jobs-ci-test.yml.jinja2
index 1eb2fb1..d33a30c 100644
--- a/build-jobs-ci-test.yml.jinja2
+++ b/build-jobs-ci-test.yml.jinja2
@@ -5,7 +5,7 @@
# As the trigger job is not executed in a environment with checked out repository, we
# need to get the includes directly from gitlab
include:
- - project: '{{ CI_PROJECT_ROOT_NAMESPACE }}/yocto/infrastructure/gitlab-ci'
+ - project: '{{ CI_PROJECT_ROOT_NAMESPACE }}/infrastructure/gitlab-ci'
ref: {{ GITLAB_CI_REVISION }}
file:
- build-common.yml
diff --git a/manifest-integration-jobs.yml.jinja2 b/manifest-integration-jobs.yml.jinja2
index 1553845..7a8c51c 100644
--- a/manifest-integration-jobs.yml.jinja2
+++ b/manifest-integration-jobs.yml.jinja2
@@ -4,13 +4,13 @@
# --------------------------------------------------------------------------------------
include:
# FIXME: see FIXME comments in manifest-integration-pipelines.yml.jinja2
- # - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
+ # - project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
# ref: ${GITLAB_CI_REVISION}
- - project: {{ CI_PROJECT_ROOT_NAMESPACE }}/yocto/infrastructure/gitlab-ci
+ - project: {{ CI_PROJECT_ROOT_NAMESPACE }}/infrastructure/gitlab-ci
ref: {{ GITLAB_CI_REVISION }}
file: common.yml
-workflow:
+wor
rules:
- if: $CI_PIPELINE_SOURCE == "parent_pipeline"
diff --git a/manifest-integration-pipelines.yml.jinja2 b/manifest-integration-pipelines.yml.jinja2
index 01d71a8..3be6517 100644
--- a/manifest-integration-pipelines.yml.jinja2
+++ b/manifest-integration-pipelines.yml.jinja2
@@ -3,7 +3,7 @@
# Global
# --------------------------------------------------------------------------------------
include:
- - project: edgehog/yocto_ng/gitlab-ci
+ - project: yocto_ng/infrastructure/gitlab-ci
ref: {{ GITLAB_CI_REVISION }}
file: common.yml
@@ -73,7 +73,7 @@ generate:
trigger:
include:
# FIXME: Use these settings after switching from jinja2 to yaml (see above)
- # project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
+ # project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
# ref: ${GITLAB_CI_REVISION}
# file: manifest-integration-jobs.yml
artifact: manifest-integration-jobs-{{ loop.index }}.yml
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 34aabee..c8fcd13 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -8,7 +8,12 @@ include:
- local: boards/.a62.yml
- local: boards/.c20.yml
- local: boards/.c31.yml
-
+
+default:
+ artifacts:
+ expire_in: 48 hrs
+ when: always
+
variables:
# The id of the gitlab project used in the rules section to not run pipelines in
# forked projects. Using variable here, to allow override in other projects including
@@ -22,8 +27,14 @@ variables:
# GitLab group to search for projects to retrigger
RETRIGGER_GROUP: ${CI_PROJECT_ROOT_NAMESPACE}
-
BUILD_TIMEOUT: 6h
+ RECIPE_NAME: seco-image-edgehog
+ IMAGES_PATH: "tmp/deploy/images"
+ TAG_NAME: weekly
+ KERNEL: 5-10-52
+ GIT_SSL_NO_VERIFY: 1
+ FS_EXTENSION: rootfs.tar.bz2
+ IMAGE_EXTENSION: wic.bz2
# This is the jinja2 template file used to generate the build jobs
#BUILD_JOBS_TEMPLATE: build-jobs-yocto.yml.jinja2
--
GitLab