From 9cbac19b0d0be9dd7e40e1004d56521ebc54b791 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 21 Nov 2022 10:43:41 +0000 Subject: [PATCH] Integrate gitlab-ci/move-deploy-jobs-to-deploy-runner -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/9982711f4f5600b7031c8ee7bddefafdb1497516 Move deploy jobs to deploy runner --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- SRCREV.conf | 28 ++++++++++++++-------------- default.xml | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index e48b4c0b..9982711f 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit e48b4c0b80a4e3fa6c25d4dfbc0f94504845e33b +Subproject commit 9982711f4f5600b7031c8ee7bddefafdb1497516 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83392d0f..a986ee95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: e48b4c0b80a4e3fa6c25d4dfbc0f94504845e33b + ref: 9982711f4f5600b7031c8ee7bddefafdb1497516 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: e48b4c0b80a4e3fa6c25d4dfbc0f94504845e33b + GITLAB_CI_REVISION: 9982711f4f5600b7031c8ee7bddefafdb1497516 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index d8f57f46..f9ff3edd 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,16 +1,16 @@ -SRCREV:pn-egalaxi2c = "8ea4de6f46ffdff2832a89f5796c0eb6912ce41e" -SRCREV:pn-emc-test-suite = "8b079a74c1a5a7477c8919d8bad1119ca65d105a" -SRCREV:pn-gf-productiontests = "573b8eeef52937242d58c62bae7b01a4017b7fda" -SRCREV:pn-gfeeprom = "f41c68a38ad1220aabb6c08626890840f57972fd" -SRCREV:pn-gfplatdetect = "663d2c9f417d707f73742a05461663290748e5e1" -SRCREV:pn-gfxml2dto = "77799da77382a68eb4408bc4b3f4c47197d985eb" -SRCREV:pn-seco-show-demo = "3efa98e1e01af6e4610bfd07b90d8fbbb7ea3ca4" -SRCREV:pn-libmdb = "9e057c125429a7720956d3067fcda0d6e66d09db" +SRCREV:pn-egalaxi2c = "cc69f5f385a0e7afb2ed839f94f4b27ac691e0c3" +SRCREV:pn-emc-test-suite = "28f302e011f2301fffed639316fbaba78dd70411" +SRCREV:pn-gf-productiontests = "5a7973651645c951ef2d119922de79ed288f27dd" +SRCREV:pn-gfeeprom = "e113c726e31cb7fed36312427bec15038c5fa2d4" +SRCREV:pn-gfplatdetect = "970ebf48ef4e8cb49f7b17710c3c2aceb208092f" +SRCREV:pn-gfxml2dto = "ded1ccba11e7fd101751aa4530d7b182b64360e5" +SRCREV:pn-seco-show-demo = "9fc4fba4aeb2fc622b8f23eaac60b23a94a2c39c" +SRCREV:pn-libmdb = "f6c8e7925451867f3a286377d4e600e032ea0a49" SRCREV:pn-linux-guf = "0142c5bc8f2c1e94e674bfeb3b2cc6a9fe818761" -SRCREV:pn-linux-seconorth = "36f64724f1bb68be8e806f7a17f2641226385c22" -SRCREV:pn-linux-imx = "65760c5910a6a58496383bc1015f67a2841a5c8b" +SRCREV:pn-linux-seconorth = "0d305e16fbc73636393f7e94876b1f46630fd37a" +SRCREV:pn-linux-imx = "4411597ebcaf27bcfa740d7c0e8a861cf0379066" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "e02e43816208456e770df9f4891e37cd4afa73e2" -SRCREV:pn-u-boot-imx = "ceeeaeb5a6be1e7828e623cc1b8a9b0b0d37a55b" -SRCREV:pn-xconfig = "8a8624c373d9f325392003079f0d4c48da3d71ce" -SRCREV:pn-qt-multi-screen-compositor = "7ff4c1c2da65738d6afe2df7025d1834d2e07cb3" +SRCREV:pn-touchcal-conv = "9ab8c81d0946656668d75d215c460182e7200762" +SRCREV:pn-u-boot-imx = "a817e56b75d9acc2b9fec77a7cbe1c500309c1c3" +SRCREV:pn-xconfig = "eb0b455e23737d0602837cd03a7bf3344afb7b6d" +SRCREV:pn-qt-multi-screen-compositor = "afb135950555e9437c24e659407b4f0d7e6d57fe" diff --git a/default.xml b/default.xml index de4a2bf4..0ab85f98 100644 --- a/default.xml +++ b/default.xml @@ -21,10 +21,10 @@ <project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" /> <project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" remote="fslc" path="sources/meta-freescale" /> <project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" /> - <project name="layers/meta-seconorth-machine" revision="a5463b025061aa35c3f75711291829b31b39a7f6" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="5eeb8b4d19fdc331d68e1cb38ea553a92f6f5b93" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="24ffe9bfefc75d5e0b3212aabbf4c329eed43240" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="f4b4a3eea82dce5faf0b5b7bcedb8ea9b3b25556" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="d469620e456eeca6f0e2520c0c5ff41a09111fad" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="08acf3ca355d620e076eb7cd7a5997aa584713b3" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="ff922229f9b4da813f96ce2cbd24b41252e9a12f" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="e93c5615678b18e49fc193c8cf4fb3a5ce38ba75" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project> -- GitLab