From b434577abf453d23365aefcabc7ad3a8c19baaec Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 15 Jan 2025 14:22:59 +0000 Subject: [PATCH 1/8] lmp/jobserv: drop build-release-stable job This is an old job that is not used in the last 3 years [1]. It is currently back in use as a result of the creation of the kirkstone branch but note that this ci job did not exist for this purpose. [1] https://github.com/foundriesio/ci-scripts/commit/f74174e3be8e0850da547c785bda7def0e8e81df Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 123 ------------------------------------------------ 1 file changed, 123 deletions(-) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 19ec2f68..2e84e3ed 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -299,129 +299,6 @@ triggers: persistent-volumes: bitbake: /var/cache/bitbake - - name: build-release-stable - type: git_poller - email: - users: 'ci-notifications@foundries.io' - params: - GIT_URL: | - https://github.com/foundriesio/lmp-manifest.git - GIT_POLL_REFS: | - refs/heads/kirkstone - OTA_LITE_TAG: 'main-stable:main' - AKLITE_TAG: promoted-stable - runs: - - name: "{loop}" - container: hub.foundries.io/lmp-sdk - host-tag: amd64-partner-gcp-nocache - loop-on: - - param: MACHINE - values: - - am62xx-evm - - am64xx-evm - - beaglebone-yocto - - generic-arm64 - - intel-corei7-64 - - imx6ullevk - - imx6ullevk-sec - - imx8mm-lpddr4-evk - - imx8mm-lpddr4-evk-sec - - imx8mp-lpddr4-evk - - imx8mp-lpddr4-evk-sec - - imx8mn-ddr4-evk - - imx8mn-ddr4-evk-sec - - imx8mn-lpddr4-evk - - imx8mn-lpddr4-evk-sec - - imx8mq-evk - - imx93-11x11-lpddr4x-evk - - jetson-orin-nano-devkit-nvme - - jetson-agx-xavier-devkit - - jetson-agx-orin-devkit - - qemuarm64-secureboot - - raspberrypi4-64 - - stm32mp15-disco - - stm32mp15-disco-sec - - stm32mp15-eval - - stm32mp15-eval-sec - - kv260 - - vck190-versal - params: - IMAGE: lmp-base-console-image - MFGTOOL_FLASH_IMAGE: lmp-base-console-image - EULA_stm32mp15eval: "1" - EULA_stm32mp15disco: "1" - script-repo: - name: fio - path: lmp/build.sh - persistent-volumes: - bitbake: /var/cache/bitbake - - # mfgtool / uuu related build files - - name: mfgtool-{loop} - container: hub.foundries.io/lmp-sdk - host-tag: amd64-partner-gcp-nocache - loop-on: - - param: MACHINE - values: - - imx6ullevk - - imx6ullevk-sec - - imx8mm-lpddr4-evk - - imx8mm-lpddr4-evk-sec - - imx8mp-lpddr4-evk - - imx8mp-lpddr4-evk-sec - - imx8mn-ddr4-evk - - imx8mn-ddr4-evk-sec - - imx8mn-lpddr4-evk - - imx8mn-lpddr4-evk-sec - - imx8mq-evk - - imx93-11x11-lpddr4x-evk - params: - DISTRO: lmp-mfgtool - IMAGE: mfgtool-files - EXTRA_ARTIFACTS: "mfgtool-files.tar.gz" - script-repo: - name: fio - path: lmp/build.sh - persistent-volumes: - bitbake: /var/cache/bitbake - - # STM32 mfgtool - - name: mfgtool-{loop} - container: hub.foundries.io/lmp-sdk - host-tag: amd64-partner-gcp-nocache - loop-on: - - param: MACHINE - values: - - stm32mp15-disco-sec - - stm32mp15-eval-sec - params: - DISTRO: lmp-mfgtool - IMAGE: stm32-mfgtool-files - EXTRA_ARTIFACTS: "stm32-mfgtool-files.tar.gz" - script-repo: - name: fio - path: lmp/build.sh - persistent-volumes: - bitbake: /var/cache/bitbake - - # TI mfgtool - - name: mfgtool-{loop} - container: hub.foundries.io/lmp-sdk - host-tag: amd64-partner-gcp-nocache - loop-on: - - param: MACHINE - values: - - am62xx-evm - params: - DISTRO: lmp-mfgtool - IMAGE: ti-mfgtool-files - EXTRA_ARTIFACTS: "ti-mfgtool-files.tar.gz" - script-repo: - name: fio - path: lmp/build.sh - persistent-volumes: - bitbake: /var/cache/bitbake - - name: Code Review type: github_pr webhooks: From d6277fa62fd1bc9687a78fe5190be8da779766f3 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 15 Jan 2025 14:28:56 +0000 Subject: [PATCH 2/8] lmp/jobserv: rename the build-release to build-kirkstone This job will stop following the main branch and will start following the kirkstone branch. Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 2e84e3ed..973b2f81 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -1,6 +1,6 @@ timeout: 540 # a build with no cache is quite slow triggers: - - name: build-release + - name: build-kirkstone type: git_poller email: users: 'ci-notifications@foundries.io' @@ -12,8 +12,8 @@ triggers: GIT_URL: | https://github.com/foundriesio/lmp-manifest.git GIT_POLL_REFS: | - refs/heads/main - OTA_LITE_TAG: main + refs/heads/kirkstone + OTA_LITE_TAG: kirkstone runs: - name: lmp-sdk host-tag: amd64 From 0e99d1d09be47b52910305ab5441bd46d3d0ad61 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 26 Mar 2025 12:26:24 +0000 Subject: [PATCH 3/8] Revert "lmp/jobserv: temporarily drop from build-release the deprecated machines" This reverts commit 7be3f30cfbe99cf0c4923369753c8090ed2e0aa4. Given previous job name change and the coresponding ref to follow the kirkstone branch, we can enable this machines again since these machines are still available in v94 version. Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 973b2f81..3e382828 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -52,9 +52,17 @@ triggers: - qemuarm64-secureboot - raspberrypi4-64 - raspberrypi5 + - stm32mp15-disco + - stm32mp15-disco-sec + - stm32mp15-eval + - stm32mp15-eval-sec + - kv260 + - vck190-versal params: IMAGE: lmp-base-console-image MFGTOOL_FLASH_IMAGE: lmp-base-console-image + EULA_stm32mp15eval: "1" + EULA_stm32mp15disco: "1" script-repo: name: fio path: lmp/build.sh @@ -90,6 +98,25 @@ triggers: persistent-volumes: bitbake: /var/cache/bitbake + # STM32 mfgtool + - name: mfgtool-{loop} + container: hub.foundries.io/lmp-sdk + host-tag: amd64-partner-gcp-nocache + loop-on: + - param: MACHINE + values: + - stm32mp15-disco-sec + - stm32mp15-eval-sec + params: + DISTRO: lmp-mfgtool + IMAGE: stm32-mfgtool-files + EXTRA_ARTIFACTS: "stm32-mfgtool-files.tar.gz" + script-repo: + name: fio + path: lmp/build.sh + persistent-volumes: + bitbake: /var/cache/bitbake + # TI mfgtool - name: mfgtool-{loop} container: hub.foundries.io/lmp-sdk From 3c853124cc19a5065bd1ad6a26470c0766842bbf Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 15 Jan 2025 16:06:40 +0000 Subject: [PATCH 4/8] lmp/jobserv: add AKLITE_TAG to build-kirkstone job All the other jobs have the AKLITE_TAG so add them. Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 3e382828..a5331839 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -14,6 +14,8 @@ triggers: GIT_POLL_REFS: | refs/heads/kirkstone OTA_LITE_TAG: kirkstone + AKLITE_TAG: promoted-kirkstone + runs: - name: lmp-sdk host-tag: amd64 From ac5cd1db809c59c383ec85b5a895afec087cf61f Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Thu, 13 Mar 2025 16:36:12 +0000 Subject: [PATCH 5/8] lmp/jobserv: replace the build-main-next job with build-main We don't need anymore the build-main-next job because we have the main branch now free to track the upstream main/master. Let's also start with less machinery and then we add as needed. Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index a5331839..7fc3e283 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -137,7 +137,7 @@ triggers: persistent-volumes: bitbake: /var/cache/bitbake - - name: build-main-next + - name: build-main type: git_poller email: users: 'ci-notifications@foundries.io' @@ -149,9 +149,9 @@ triggers: GIT_URL: | https://github.com/foundriesio/lmp-manifest.git GIT_POLL_REFS: | - refs/heads/main-next - OTA_LITE_TAG: 'main-next:main' - AKLITE_TAG: promoted-next + refs/heads/main + OTA_LITE_TAG: 'main' + AKLITE_TAG: promoted-main runs: # images with no OTA - name: "{loop}" @@ -160,24 +160,8 @@ triggers: loop-on: - param: MACHINE values: - - am62xx-evm - - am64xx-evm - - beaglebone-yocto - - generic-arm64 - intel-corei7-64 - - imx6ullevk - - imx6ullevk-sec - - imx8mm-lpddr4-evk - - imx8mp-lpddr4-evk - - imx8mn-ddr4-evk - - imx8mn-lpddr4-evk - - imx8mq-evk - - imx93-11x11-lpddr4x-evk - - jetson-orin-nano-devkit-nvme - - jetson-agx-xavier-devkit - - jetson-agx-orin-devkit - qemuarm64-secureboot - - raspberrypi4-64 params: IMAGE: lmp-base-console-image MFGTOOL_FLASH_IMAGE: lmp-base-console-image From f9810f98a18e01d7cb8364e4ad9f658f8cd390c2 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Thu, 13 Mar 2025 16:39:34 +0000 Subject: [PATCH 6/8] lmp/jobserv: reorder the build jobs Let's start from oldest to newest: - build-kirkstone - build-scarthgap - build-main Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 7fc3e283..19dd6307 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -137,7 +137,7 @@ triggers: persistent-volumes: bitbake: /var/cache/bitbake - - name: build-main + - name: build-scarthgap type: git_poller email: users: 'ci-notifications@foundries.io' @@ -149,9 +149,9 @@ triggers: GIT_URL: | https://github.com/foundriesio/lmp-manifest.git GIT_POLL_REFS: | - refs/heads/main - OTA_LITE_TAG: 'main' - AKLITE_TAG: promoted-main + refs/heads/scarthgap + OTA_LITE_TAG: 'scarthgap' + AKLITE_TAG: promoted-scarthgap runs: # images with no OTA - name: "{loop}" @@ -160,8 +160,29 @@ triggers: loop-on: - param: MACHINE values: + - am62xx-evm + - am64xx-evm + - beaglebone-yocto + - generic-arm64 - intel-corei7-64 + - imx6ullevk + - imx6ullevk-sec + - imx8mm-lpddr4-evk + - imx8mm-lpddr4-evk-sec + - imx8mp-lpddr4-evk + - imx8mp-lpddr4-evk-sec + - imx8mn-ddr4-evk + - imx8mn-ddr4-evk-sec + - imx8mn-lpddr4-evk + - imx8mn-lpddr4-evk-sec + - imx8mq-evk + - imx93-11x11-lpddr4x-evk + - jetson-orin-nano-devkit-nvme + - jetson-agx-xavier-devkit + - jetson-agx-orin-devkit - qemuarm64-secureboot + - raspberrypi4-64 + - raspberrypi5 params: IMAGE: lmp-base-console-image MFGTOOL_FLASH_IMAGE: lmp-base-console-image @@ -214,7 +235,7 @@ triggers: persistent-volumes: bitbake: /var/cache/bitbake - - name: build-scarthgap + - name: build-main type: git_poller email: users: 'ci-notifications@foundries.io' @@ -226,9 +247,9 @@ triggers: GIT_URL: | https://github.com/foundriesio/lmp-manifest.git GIT_POLL_REFS: | - refs/heads/scarthgap - OTA_LITE_TAG: 'scarthgap' - AKLITE_TAG: promoted-scarthgap + refs/heads/main + OTA_LITE_TAG: 'main' + AKLITE_TAG: promoted-main runs: # images with no OTA - name: "{loop}" @@ -237,29 +258,8 @@ triggers: loop-on: - param: MACHINE values: - - am62xx-evm - - am64xx-evm - - beaglebone-yocto - - generic-arm64 - intel-corei7-64 - - imx6ullevk - - imx6ullevk-sec - - imx8mm-lpddr4-evk - - imx8mm-lpddr4-evk-sec - - imx8mp-lpddr4-evk - - imx8mp-lpddr4-evk-sec - - imx8mn-ddr4-evk - - imx8mn-ddr4-evk-sec - - imx8mn-lpddr4-evk - - imx8mn-lpddr4-evk-sec - - imx8mq-evk - - imx93-11x11-lpddr4x-evk - - jetson-orin-nano-devkit-nvme - - jetson-agx-xavier-devkit - - jetson-agx-orin-devkit - qemuarm64-secureboot - - raspberrypi4-64 - - raspberrypi5 params: IMAGE: lmp-base-console-image MFGTOOL_FLASH_IMAGE: lmp-base-console-image From bc17ed10a49d6bbea46adf55090ab9b32ac89a97 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Thu, 13 Mar 2025 16:42:51 +0000 Subject: [PATCH 7/8] lmp/jobserv: build the lmp-sdk on the latest LTS build The run of the job was on the build-kirkstone that is now the previous LTS. Move it to the latest LTS stable which is the build-scarthgap. Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 19dd6307..6797b187 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -17,13 +17,6 @@ triggers: AKLITE_TAG: promoted-kirkstone runs: - - name: lmp-sdk - host-tag: amd64 - container: foundries/dind-ci:19.03.9_b38f166 - privileged: true - script-repo: - name: fio - path: lmp/build-sdk-container.sh # images with no OTA - name: "{loop}" container: hub.foundries.io/lmp-sdk @@ -153,6 +146,13 @@ triggers: OTA_LITE_TAG: 'scarthgap' AKLITE_TAG: promoted-scarthgap runs: + - name: lmp-sdk + host-tag: amd64 + container: foundries/dind-ci:19.03.9_b38f166 + privileged: true + script-repo: + name: fio + path: lmp/build-sdk-container.sh # images with no OTA - name: "{loop}" container: hub.foundries.io/lmp-sdk From c52d523d7441a2f4d02f0ed4d07cdb50901feb7a Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Thu, 13 Mar 2025 16:42:51 +0000 Subject: [PATCH 8/8] lmp/jobserv: add lmp-sdk run to the main branch push jobs Add this job to build the container on the main branch jobs build-main. Signed-off-by: Jose Quaresma --- lmp/jobserv.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml index 6797b187..40b1bfae 100644 --- a/lmp/jobserv.yml +++ b/lmp/jobserv.yml @@ -251,6 +251,16 @@ triggers: OTA_LITE_TAG: 'main' AKLITE_TAG: promoted-main runs: + # FIXME: + # I need to tag this container with a different name + # so that it is used only here + - name: lmp-sdk + host-tag: amd64 + container: foundries/dind-ci:19.03.9_b38f166 + privileged: true + script-repo: + name: fio + path: lmp/build-sdk-container.sh # images with no OTA - name: "{loop}" container: hub.foundries.io/lmp-sdk