From b71882fe1e4a3c5c71a4743c8151a343d40d55fb Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Tue, 20 Dec 2022 10:24:21 +0000 Subject: [PATCH] Integrate gitlab-ci/alphaplan-import-allow-failure and 19 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d404f25753e07da8a97145706ecf7aaf5fd52f0a Alphaplan: allow failure on import Otherwise the parent pipeline is stuck in "running" state until the manual action has been performed. See for reference: https://gitlab.com/gitlab-org/gitlab/-/issues/361574 -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dd2a6d7dbe7c4393fc63c80ff49ba3b7135e26c0 Fix error message -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/04ac29ad7a3f82d97f8bb805cb78b2746517bc81 CI-Test: fix deploy-files job -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/22c519f1ed1f97126a0a278c45ee130d86da4263 Move FTP jobs to FTP runner -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/84d0616b24da99bd9bf0cc5ac4ba080123531b96 Add new deploy pipeline to Yocto -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f0436868a077ea4fa9474b69ea8b87f2181a41ce Move reusable parts from CI-Test to common -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3d3b4d09abf62a6c2afc82811cc0e5d1b99b415c Yocto: fix SDK package -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3736028800c19dae1cec2a0ffcef4f92e6383630 Yocto: fix SDK build -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2b6fc739fb82cbd3bbc4c3db31a55f07de82cd58 Package: add comment -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/95d6e368dc2fb1a350c5cb02c7859875440cbb65 alphaplan_fwr_import: add error handling -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/277d4af783b5017bf64bf128b8dd5888e28b9440 Package & deploy: do not allow missing dotenv file -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3c68ccab51bcc4f698da3a9e97bdf13466156c4e Alphaplan: add script for importing alphaplan data The script has mostly been copied from alphaplan_fwr.py, but with different input data. Adding a job to the CI-test environment for testing this. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3b3238a1afaafe2ca4b7dca3b1897453e3dc2312 Alphaplan: add script for generating alphaplan data This script has mostly been copied from alphaplan_fwr.py, but with different input data (artifacts from the SoftwareStore deploy job) and without actually importing the data to the Alphaplan database. Adding a job to the CI-test environment for testing this. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/387b81842ce0107ebfd4b379232cda47514c4320 Deploy: save variables in deploy.env -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/902c927699bf6b071559023cb17b98a73a1e6ace Deploy: save rsync file list for later stages -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/15622149f1d0ee0272887137cf50237202415de5 CI-test: use caching between the pipeline stages -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a96a923ebd5135ab45cb14b5bca64e21a2471a9a CI-test: add deploy stages for SoftwareStore and FTP Rename all stages to uppercase on this occasion, since we're adding stages with names containing multiple words. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/056f1af15d6d819bffd18b4613356277cf027db1 Add package class and stage -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a19727240729780ab117d5602d59b1a3dec2e02a Add script to query job logs filtered by status, tag, and log pattern -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d501fed461e7683acb61010300c3f6083dccdfe3 Update isort config --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 9982711..d404f25 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 +Subproject commit d404f25753e07da8a97145706ecf7aaf5fd52f0a diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8f163a..98c572a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,11 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 9982711f4f5600b7031c8ee7bddefafdb1497516 + ref: d404f25753e07da8a97145706ecf7aaf5fd52f0a file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 + GITLAB_CI_REVISION: d404f25753e07da8a97145706ecf7aaf5fd52f0a BB_RECIPE_NAME: xconfig # FIXME: This is only necessary due to the following GitLab limitation: # https://gitlab.com/gitlab-org/gitlab/-/issues/209904 -- GitLab