From fa96bdbbc762df12dbcac853706bc87020e3feb7 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Tue, 18 Oct 2022 19:22:14 +0000 Subject: [PATCH] Integrate gitlab-ci/add-hide-ftp-upload-flag -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a5e27f6e215f7f26af354a3c03b8e3c6ee5ed1f9 FTP upload: Add flag to hide FTP upload stage This is a workaround to prevent customer releases being uploaded to our public FTP area. It should be removed as soon as we support uploading to different FTP target folders. --- .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 543a2170..a5e27f6e 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 543a217064786c3ac2742c24c09f603de495541d +Subproject commit a5e27f6e215f7f26af354a3c03b8e3c6ee5ed1f9 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cea5fd8f..99beeefd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 543a217064786c3ac2742c24c09f603de495541d + ref: a5e27f6e215f7f26af354a3c03b8e3c6ee5ed1f9 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 543a217064786c3ac2742c24c09f603de495541d + GITLAB_CI_REVISION: a5e27f6e215f7f26af354a3c03b8e3c6ee5ed1f9 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index b63cbbb1..5ff39bba 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,16 +1,16 @@ -SRCREV:pn-egalaxi2c = "b1762435f9dd6fb84ee2911e300dafe677f5ce90" -SRCREV:pn-emc-test-suite = "a6b9bed57ed1afbfef97a8b90388cfc5d09223ad" -SRCREV:pn-gf-productiontests = "b422492de0d82b150ca608d01035ed288f37fd99" -SRCREV:pn-gfeeprom = "bd33343f933e2691053c2f977c09d423c21a9738" -SRCREV:pn-gfplatdetect = "95d6521af73afe0d6585d1f43ffca69a3078f5e5" -SRCREV:pn-gfxml2dto = "7297bad5fcdbfe03b1c4c6d92aa33020a8fa969d" -SRCREV:pn-seco-show-demo = "b50600f0cfb5fdd51d5c63dd51297909d31369df" -SRCREV:pn-libmdb = "86837cf1660d47244d994ae73134a1645f58c20b" +SRCREV:pn-egalaxi2c = "68dafc8db01642ff526ce288623cf058d7d5bbc8" +SRCREV:pn-emc-test-suite = "21c3daaa70b052ce061454d289ded8a189bb6020" +SRCREV:pn-gf-productiontests = "e57448c3fa158310f851ce5f67391f5ba82ea69f" +SRCREV:pn-gfeeprom = "8328b2207be60f5595dd675fc44d4f65af3670a1" +SRCREV:pn-gfplatdetect = "0a33d2d1f051bef143c903df13fbfe9aa285279e" +SRCREV:pn-gfxml2dto = "a82b929ec21e3e6ead45c03410a15665d463253e" +SRCREV:pn-seco-show-demo = "ea881d2ee34a05ba9673b8af7e319dcf0b1d551e" +SRCREV:pn-libmdb = "cb429674f2684641a37df27b4a9e981228f6f249" SRCREV:pn-linux-guf = "0142c5bc8f2c1e94e674bfeb3b2cc6a9fe818761" -SRCREV:pn-linux-seconorth = "5bff5478c85b9e4aa213c7c92c42872a9d42d932" -SRCREV:pn-linux-imx = "93b5095bb20c06490c250e6f580a8b01fc686767" +SRCREV:pn-linux-seconorth = "950d673c5117fa096a68eff2988d67838a4a0a29" +SRCREV:pn-linux-imx = "3c5acae96112c677679f98f35db7da993efbaf9e" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "9251c3398bf53623dc7b12a247602672522a2440" -SRCREV:pn-u-boot-imx = "012752cdadae348f39026258dbd3cc5cbb3b0274" -SRCREV:pn-xconfig = "b1e0b0632a0843d294a726c5edd8661b4ac6efa2" -SRCREV:pn-qt-multi-screen-compositor = "c678cab3a323ca8e6192c1023b51a11c20625214" +SRCREV:pn-touchcal-conv = "cb6ba139e7ada762368f43e5b87194a7fadec6e0" +SRCREV:pn-u-boot-imx = "f342a71af7adbdeca69d2686866e53a7ac709c2e" +SRCREV:pn-xconfig = "d95570e8777f95dd96f4428f73cb762a1d833bdd" +SRCREV:pn-qt-multi-screen-compositor = "5b6bf1a37c5d97da91446de0ef7522e97946ad75" diff --git a/default.xml b/default.xml index 863d8f1b..2b601804 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="75324268ebadda4feda76eb6fa9dd1b68c7ae305" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="97864e0e3a828677c17142ed4e0fcad60277b79f" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="234ad3e100e81ef4c15c09ef849d82978334788c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="0af4017357a33f2a4be389bbeb04ef966226570a" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="78ac5c60293388d81242163fbc1e2e515c59f8f1" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="94baba530c501ec93f068e49afe7c7866477ce5d" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="b944812abe662bca86a960567748bfa9e919a275" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="0288f332f343a2da410f04d85cfa8b0b52605403" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project> -- GitLab