From d33442c3aa31ec2b9b6b2c4b25e773050ce835c7 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Wed, 13 Apr 2022 09:48:58 +0000 Subject: [PATCH] Integrate gitlab-ci/refactor_manifest-ci and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6c3a8ff7c2a5e56bdeaf3f2b1fa0c461520e9070 CI:package_release: Remove "GUF-" prefix from gitlab artifacts dir BCS 746-000637 -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d809d630c44e5e2ef3476f1bde19b42330e5775e manifest-CI: Refactor manifest pipeline files * Split up build and package steps in separate files * Add additional comments * Add log output BCS 746-000637 --- .gitlab-ci | 2 +- .gitlab-ci.yml | 2 +- SRCREV.conf | 26 +++++++++++++------------- default.xml | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index c917791b..6c3a8ff7 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit c917791bc6d4a9494db5a393604ab9da23dee22c +Subproject commit 6c3a8ff7c2a5e56bdeaf3f2b1fa0c461520e9070 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb6ceb16..91e06f26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,5 +4,5 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: c917791bc6d4a9494db5a393604ab9da23dee22c + ref: 6c3a8ff7c2a5e56bdeaf3f2b1fa0c461520e9070 file: 'manifest.yml' diff --git a/SRCREV.conf b/SRCREV.conf index 48fd755c..075ae5bf 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,13 +1,13 @@ -SRCREV_pn-gf-productiontests = "376d5f94069388b7fda40d8219e417f67e5d2848" -SRCREV_pn-gfeeprom = "9b1898829c0260956826f920ce2fa997bf3fae37" -SRCREV_pn-guf-show-demo = "76411ab57a5f934458da71cd6769392bc606a10b" -SRCREV_pn-libmdb = "1b4cf2de2fcb3053e219a1aba02ab4360fd902c6" -SRCREV_pn-ltp-guf-tests = "cdf8e3265ae19b4836f9ab2054d89339b5b2b4f9" -SRCREV_pn-touchcal-conv = "544e5d7fb198ad12e4dc26942add6902198cda80" -SRCREV_pn-gfxml2dto = "3b1693245524c13752ebb41d3d17ee153bc1477c" -SRCREV_pn-egalaxi2c = "982d0a16bf232bbac02ca96a6a72234cb4a4a3bc" -SRCREV_pn-gfplatdetect = "4925c291b85edf7af396c2b0f89f15b56901137b" -SRCREV_pn-xconfig = "ed190e1978e6d75171f2ae1dbdf403718c1cebf8" -SRCREV_pn-linux-guf = "4d8ae1d1fcfac720aecc83bb40c1ac0f212d2fac" -SRCREV_pn-linux-imx-kuk = "371f7de8e6a1c52d426d2e0b791db80e0e951e43" -SRCREV_pn-u-boot-imx = "53e98f546e8457957c44baefae022664e4310c20" +SRCREV_pn-gf-productiontests = "543b080a44dc3779f9ec76637e1f11215d0d88bb" +SRCREV_pn-gfeeprom = "da91b5d97d419975d31a95e8f13e4bc83ee613d4" +SRCREV_pn-guf-show-demo = "b9550c30d4c87fbd9e3495be1ee7453bfc86be9f" +SRCREV_pn-libmdb = "55460e3e3354883533be3554e9ede3303d626f7b" +SRCREV_pn-ltp-guf-tests = "bc254697d7fc04a2f8fe1ac49031c1a193659373" +SRCREV_pn-touchcal-conv = "1e8a19e459299c4a77de9b04a1828a79613d7eea" +SRCREV_pn-gfxml2dto = "ab5f14f86cff9ae27fbbc7765f9a1b06824dbd2a" +SRCREV_pn-egalaxi2c = "eacee19fe2bf02c8a00e25eb4494390d03c3cedd" +SRCREV_pn-gfplatdetect = "bf3dbf8dc1707c41efdf863c0d3762dd1a2005be" +SRCREV_pn-xconfig = "56afeb74eb5672982584291ffb6e0008d3756080" +SRCREV_pn-linux-guf = "46b3952e3b35b91088408cf4e607fcf781fe963f" +SRCREV_pn-linux-imx-kuk = "6eac325df3391a9501d7a2fb8ef098f8928b9a60" +SRCREV_pn-u-boot-imx = "cedbe2148f087d8fed93db26e5daee49d18113ad" diff --git a/default.xml b/default.xml index 1a346ec6..5d118140 100644 --- a/default.xml +++ b/default.xml @@ -23,9 +23,9 @@ <project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" /> <project name="meta-freescale.git" revision="5a026be5a6b29a27a7754d7fa5d4765c99f98ed9" remote="fslc" path="sources/meta-freescale" /> <project name="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" /> - <project name="layers/meta-guf-machine" revision="de5f4d6e9a62fc1351f34fecac534712b12cd418" remote="seco-ne" path="sources/meta-guf-machine" /> - <project name="layers/meta-guf-distro" revision="494a96c4ce666c4bc0b19c6bacebe26082b67ac4" remote="seco-ne" path="sources/meta-guf-distro" /> - <project name="config" revision="fca0f7583b68b06ae6820910e41620c470a74ec3" remote="seco-ne" path=".conf" > + <project name="layers/meta-guf-machine" revision="f62ba64875834f09330e78b0015021e02fc70868" remote="seco-ne" path="sources/meta-guf-machine" /> + <project name="layers/meta-guf-distro" revision="0285196746bdb1906a6e770359f66d11b3ca96e9" remote="seco-ne" path="sources/meta-guf-distro" /> + <project name="config" revision="cd7eb15242ec139298dce17a6bc59a3dbd40b7a7" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment"/> </project> </manifest> -- GitLab