diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index f2b8216750ebc1781038ceef70753b929c46c0ca..b4ec91f842ad87a4f6876191f3fea5598375f218 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -71,192 +71,161 @@ release:
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_q7_928_edgehog" %}
{% set BUILD_DIR = "build_928" %}
- {% set KERNEL = "5-10-x" %}
{% elif '962' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_uq7_962_edgehog" %}
{% set BUILD_DIR = "build_962" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'a62' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_sbc_a62_edgehog" %}
{% set BUILD_DIR = "build_a62" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'a75' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_uq7_a75_edgehog" %}
{% set BUILD_DIR = "build_a75" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'b08' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6sx-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_sbc_b08_edgehog" %}
{% set BUILD_DIR = "build_b08" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c23' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6sx-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_sbc_c23_edgehog" %}
{% set BUILD_DIR = "build_c23" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c12' in machine %}
{% set PROCESSOR = "imx8mq" %}
{% set MACHINE = "seco-imx8mq-" + machine %}
{% set DEFCONFIG = "seco_smarc_c12_edgehog" %}
{% set BUILD_DIR = "build_c12" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c20' in machine %}
{% set PROCESSOR = "imx8mq" %}
{% set MACHINE = "seco-imx8mq-" + machine %}
{% set DEFCONFIG = "seco_sbc_c20_edgehog" %}
{% set BUILD_DIR = "build_c20" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c25' in machine %}
{% set PROCESSOR = "imx8mq" %}
{% set MACHINE = "seco-imx8mq-" + machine %}
{% set DEFCONFIG = "seco_q7_c25_edgehog" %}
{% set BUILD_DIR = "build_c25" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c26' in machine %}
{% set PROCESSOR = "imx8qm" %}
{% set MACHINE = "seco-imx8qm-" + machine %}
{% set DEFCONFIG = "seco_q7_c26_edgehog" %}
{% set BUILD_DIR = "build_c26" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c31' in machine %}
{% set PROCESSOR = "rk3399" %}
{% set MACHINE = "seco-rk3399-" + machine %}
{% set DEFCONFIG = "seco_sbc_c31_edgehog" %}
{% set BUILD_DIR = "build_c31" %}
- {% set KERNEL = "4-19-111" %}
{% elif 'c43' in machine %}
{% set PROCESSOR = "imx8qm" %}
{% set MACHINE = "seco-imx8qm-" + machine %}
{% set DEFCONFIG = "seco_sbc_c43_edgehog" %}
{% set BUILD_DIR = "build_c43" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c57' in machine %}
{% set PROCESSOR = "imx8x" %}
{% set MACHINE = "seco-imx8x-" + machine %}
{% set DEFCONFIG = "seco_sbc_c57_edgehog" %}
{% set BUILD_DIR = "build_c57" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c58' in machine %}
{% set PROCESSOR = "imx8x" %}
{% set MACHINE = "seco-imx8x-" + machine %}
{% set DEFCONFIG = "seco_q7_c58_edgehog" %}
{% set BUILD_DIR = "build_c58" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c61' in machine %}
{% set PROCESSOR = "imx8mm" %}
{% set MACHINE = "seco-imx8mm-" + machine %}
{% set DEFCONFIG = "seco_sbc_c61_edgehog" %}
{% set BUILD_DIR = "build_c61" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c72n' in machine %}
{% set PROCESSOR = "imx8mn" %}
{% set MACHINE = "seco-imx8mn-c72" %}
{% set DEFCONFIG = "seco_q7_c72n_edgehog" %}
{% set BUILD_DIR = "build_c72n" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c72nl' in machine %}
{% set PROCESSOR = "imx8mnl" %}
{% set MACHINE = "seco-imx8mnl-c72" %}
{% set DEFCONFIG = "seco_q7_c72nl_edgehog" %}
{% set BUILD_DIR = "build_c72nl" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'c72m' in machine %}
{% set PROCESSOR = "imx8mm" %}
{% set MACHINE = "seco-imx8mm-c72" %}
{% set DEFCONFIG = "seco_q7_c72m_edgehog" %}
{% set BUILD_DIR = "build_c72m" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'd16' in machine %}
{% set PROCESSOR = "imx8x" %}
{% set MACHINE = "seco-imx8x-" + machine %}
{% set DEFCONFIG = "seco_smarc_d16_edgehog" %}
{% set BUILD_DIR = "build_d16" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'd18' in machine %}
{% set PROCESSOR = "imx8mp" %}
{% set MACHINE = "seco-imx8mp-" + machine %}
{% set DEFCONFIG = "seco_smarc_d18_edgehog" %}
{% set BUILD_DIR = "build_d18" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'd23' in machine %}
{% set PROCESSOR = "px30" %}
{% set MACHINE = "seco-px30-" + machine %}
{% set DEFCONFIG = "seco_sbc_d23_edgehog" %}
{% set BUILD_DIR = "build_d23" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'e09' in machine %}
{% set PROCESSOR = "rk3568" %}
{% set MACHINE = "seco-rk3568-" + machine %}
{% set DEFCONFIG = "seco_sbc_e09_edgehog" %}
{% set BUILD_DIR = "build_e09" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'tanaro' in machine %}
{% set PROCESSOR = "imx8mm" %}
{% set MACHINE = "seco-imx8mm-" + machine %}
{% set DEFCONFIG = "seco_sbc_tanaro_edgehog" %}
{% set BUILD_DIR = "build_tanaro" %}
- {% set KERNEL = "5-10-x" %}
{% elif 'intel' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR %}
{% set DEFCONFIG = "seco_intel_edgehog" %}
{% set BUILD_DIR = "build_intel" %}
- {% set KERNEL = "6-1-x" %}
{% elif 'apollolake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-apl" %}
{% set DEFCONFIG = "seco_intel_apl_edgehog" %}
{% set BUILD_DIR = "build_intel_apl" %}
- {% set KERNEL = "6-1-x" %}
{% elif 'tigerlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-tgl" %}
{% set DEFCONFIG = "seco_intel_tgl_edgehog" %}
{% set BUILD_DIR = "build_intel_tgl" %}
- {% set KERNEL = "6-1-x" %}
{% elif 'elkhartlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-ehl" %}
{% set DEFCONFIG = "seco_intel_ehl_edgehog" %}
{% set BUILD_DIR = "build_intel_ehl" %}
- {% set KERNEL = "6-1-x" %}
{% elif 'coffeelake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-cfl" %}
{% set DEFCONFIG = "seco_intel_cfl_edgehog" %}
{% set BUILD_DIR = "build_intel_cfl" %}
- {% set KERNEL = "6-1-x" %}
{% elif 'whiskeylake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-wkl" %}
{% set DEFCONFIG = "seco_intel_wkl_edgehog" %}
{% set BUILD_DIR = "build_intel_wkl" %}
- {% set KERNEL = "6-1-x" %}
{% elif 'alderlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-adl" %}
{% set DEFCONFIG = "seco_intel_adl_edgehog" %}
- {% set BUILD_DIR = "build_intel_adl" %}
- {% set KERNEL = "6-1-x" %}
+ {% set BUILD_DIR = "build_intel_adl" %}
{% elif 'raptorlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-rpl" %}
{% set DEFCONFIG = "seco_intel_rpl_edgehog" %}
- {% set BUILD_DIR = "build_intel_rpl" %}
- {% set KERNEL = "6-1-x" %}
+ {% set BUILD_DIR = "build_intel_rpl" %}
{% endif %}
{% if PROCESSOR == 'imx6' %}
{% set UBOOT_FILE = "u-boot.imx" %}
@@ -295,10 +264,7 @@ build-{{ machine }}-{{ distro }}:
MACHINE: {{ MACHINE }}
DEFCONFIG_FILE: {{ DEFCONFIG }}
RECIPE_NAME: {{ recipe }}
- IMAGE_NAME: {{ image }}
- {% if KERNEL is defined %}
- KERNEL: {{ KERNEL }}
- {% endif %}
+ IMAGE_NAME: {{ image }}
UBOOT_FILE: {{ UBOOT_FILE }}
KERNEL_FILE: {{ KERNEL_FILE }}
AZURE_PATH: {{ AZURE_PATH }}
diff --git a/build-pipeline.yml b/build-pipeline.yml
index e4300f47823d72f9cb5f2eeaea0a5d3557be26ba..8984a7d9e1ce16d76fb1b2dd318739d596d95011 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -75,6 +75,7 @@ workflow:
time bitbake ${RECIPE_NAME};
if [[ "$CI_JOB_NAME" != *"embedded"* ]]; then time bitbake seco-bundle-edgehog; fi;
. ../.gitlab-ci/scripts/check_build_artifacts.sh;
+ . ../.gitlab-ci/scripts/get_kernel_version.sh $BOARD > $BASEDIR/kernel.txt;
"
- echo "$BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE" > $BASEDIR/pathname.txt
@@ -97,6 +98,7 @@ workflow:
paths:
- $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
- pathname.txt
+ - kernel.txt
- Job_build_report_${BOARD}_${IMAGE_NAME}.txt
- Job_build_message_${BOARD}_${IMAGE_NAME}.txt
allow_failure: true
@@ -142,7 +144,8 @@ workflow:
echo "Starting the deploy of software artifacts"
- |
echo "Deploying software artifacts to Azure.."
- . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE
+ KERNEL=$(cat kernel.txt)
+ . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE $KERNEL
echo $uboot_filename
echo $kernel_filename
echo $filesystem_name
@@ -181,7 +184,8 @@ workflow:
echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
- |
echo "Deploying software artifacts to Azure.."
- . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE
+ KERNEL=$(cat kernel.txt)
+ . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE $KERNEL
- sh .gitlab-ci/scripts/generate_report.sh $DEPLOY_PATH $AZURE_STORAGE_SAS_TOKEN $AZURE_CONTAINER_NAME $AZURE_PATH
allow_failure: true
diff --git a/scripts/artifacts_name.sh b/scripts/artifacts_name.sh
index 7099d0ce1c3dfc6a94c0f1f31fe26d698fdd3b10..939fea7ee544edacbb104bc60bd75f2ddddc4869 100644
--- a/scripts/artifacts_name.sh
+++ b/scripts/artifacts_name.sh
@@ -2,6 +2,7 @@
TAG_NAME=$1
DEPLOY_DATE=$2
+KERNEL=$3
# Check if PROCESSOR and BOARD coincide
if [ "$PROCESSOR" = "$BOARD" ]; then
diff --git a/scripts/get_kernel_version.sh b/scripts/get_kernel_version.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4c7e39d723b703322c1d35ede65021397b71cae5
--- /dev/null
+++ b/scripts/get_kernel_version.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+BOARD=$1
+PREFERRED_KERNEL=$(bitbake virtual/kernel -e | grep ^PREFERRED_PROVIDER_virtual/kernel | awk -F'=' '{print $2}' | sed 's/\"//g' | head -1)
+KERNEL_VERSION=$(bitbake virtual/kernel -e | grep ^PREFERRED_VERSION_${PREFERRED_KERNEL} | awk -F'=' '{print $2}' | sed 's/\"//g' | head -1)
+kernel_version="$(echo ${KERNEL_VERSION%\%} | sed 's/\./-/g')"
+
+case "$BOARD" in
+ *"c31"*)
+ kernel_version="4-19"
+ ;;
+ *"tanaro"*)
+ kernel_version="5-10"
+ ;;
+esac
+
+echo "$kernel_version"
\ No newline at end of file