From 5f8d735d8c1bb6fc1b998cc2399a81b0248113a6 Mon Sep 17 00:00:00 2001 From: bia1708 Date: Thu, 4 Sep 2025 14:47:33 +0300 Subject: [PATCH 1/2] ci: azure_pipelines: Update DTBs location Update DTBs build location to match the changes introduced by 3b1f15d (zynq and socfpga DTS location change). Used for later upload to artifacts server. Signed-off-by: bia1708 --- azure-pipelines.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ed4d6240a0bd7..b1367e064f041c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,8 +66,13 @@ stages: displayName: 'Device-Tree Build Test' - task: CopyFiles@2 inputs: - sourceFolder: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts' - contents: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/?(*.dtb)' + sourceFolder: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/intel/socfpga' + contents: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/intel/socfpga/?(*.dtb)' + targetFolder: '$(Build.ArtifactStagingDirectory)' + - task: CopyFiles@2 + inputs: + sourceFolder: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/xilinx' + contents: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/xilinx/?(*.dtb)' targetFolder: '$(Build.ArtifactStagingDirectory)' - task: CopyFiles@2 inputs: From c0b7c26fed3b5ae92e27e715b34bd7d0685bced1 Mon Sep 17 00:00:00 2001 From: bia1708 Date: Thu, 4 Sep 2025 14:51:38 +0300 Subject: [PATCH 2/2] ci: prepare_artifacts: Fix DTBs upload Update timestamp format to match the previous format. Fix pattern matching to upload DTBs to the correct location. Signed-off-by: bia1708 --- ci/travis/prepare_artifacts.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/travis/prepare_artifacts.sh b/ci/travis/prepare_artifacts.sh index 18c3ee399c7176..7fe2052808b134 100755 --- a/ci/travis/prepare_artifacts.sh +++ b/ci/travis/prepare_artifacts.sh @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only #!/bin/bash -e -TIMESTAMP=$(date +%Y_%m_%d-%H_%M) +TIMESTAMP=$(date +%Y_%m_%d-%H_%M_%S) # For PRs, Azure makes a merge commit (HEAD) because of the shallow copy option # (which we want). So, GIT_SHA in this case is the actual correct commit inside # the PR, and MERGE_COMMIT is the commit made by Azure (which we extract the date @@ -88,17 +88,17 @@ artifacts_structure() { echo "IMAGE: ${image_to_copy[${platform}]}!" cp ${image_to_copy[${platform}]} ${image_location} fi - done - if [ "${arch}" == "microblaze" ]; then - dtbs_to_copy=$(ls -d -1 Microblaze/*) - else - dtbs_to_copy=$(ls -d -1 DTBs/* | grep "${platform}") - fi + if [ "${arch}" == "microblaze" ]; then + dtbs_to_copy=$(ls -d -1 Microblaze/*) + else + dtbs_to_copy=$(ls -d -1 DTBs/* | grep "${platform}[-|_]") + fi - # Copy DTBs to the correct location - for dtb in ${dtbs_to_copy}; do - cp ${dtb} "${TIMESTAMP}/${arch}" + # Copy DTBs to the correct location + for dtb in ${dtbs_to_copy}; do + cp ${dtb} "${TIMESTAMP}/${arch}" + done done done }