From: Tom Rini <trini@konsulko.com>
Date: Sun, 7 Dec 2025 14:10:24 +0000 (-0600)
Subject: Merge patch series "Azure: Rework world build to directly use the container"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e12d6ccb3cfa84dd275a1b852b2a235de0162b0;p=thirdparty%2Fu-boot.git

Merge patch series "Azure: Rework world build to directly use the container"

This series from Tom Rini <trini@konsulko.com> makes some of our Azure
jobs easier to follow by removing the abstraction of calling docker from
the job we're running and instead following normal Azure Pipelines
conventions.

Link: https://lore.kernel.org/r/20251126234959.3909571-1-trini@konsulko.com
---

8e12d6ccb3cfa84dd275a1b852b2a235de0162b0
diff --cc .azure-pipelines.yml
index 828e6012b09,526deef8dd2..25b0e4c985c
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@@ -145,13 -126,17 +145,14 @@@ stages
      displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites'
      pool:
        vmImage: $(ubuntu_vm)
+     container:
+       image: $(ci_runner_image)
+       options: $(container_option)
      steps:
        - script: |
-           cat << "EOF" > build.sh
-           cd $(work_dir)
 -          # Copy things from /home/uboot to the Azure container user
 -          sudo cp -a /home/uboot/.buildman /home/uboot/.cache ~
 -          sudo chown -R 1001 ~/.cache ~/.buildman
+           # Configure git
            git config --global user.name "Azure Pipelines"
            git config --global user.email bmeng.cn@gmail.com
-           git config --global --add safe.directory $(work_dir)
            export USER=azure
            python3 -m venv /tmp/venv
            . /tmp/venv/bin/activate
@@@ -719,21 -637,19 +718,15 @@@
            BUILDMAN: $(arm_catch_all)
          aarch64_catch_all:
            BUILDMAN: $(aarch64_catch_all)
 -        everything_but_arm_and_powerpc:
 -          BUILDMAN: $(everything_but_arm_and_powerpc)
      steps:
        - script: |
-           cat << EOF > build.sh
            set -ex
-           cd ${WORK_DIR}
-           # make environment variables available as tests are running inside a container
-           export BUILDMAN="${BUILDMAN}"
-           git config --global --add safe.directory ${WORK_DIR}
 -          # Copy things from /home/uboot to the Azure container user
 -          sudo cp -a /home/uboot/.buildman /home/uboot/.cache ~
 -          sudo chown -R 1001 ~/.cache ~/.buildman
+           # Setup venv, perform build
            python3 -m venv /tmp/venv
            . /tmp/venv/bin/activate
            pip install -r tools/binman/requirements.txt \
 -            -r tools/buildman/requirements.txt
 +            -r tools/buildman/requirements.txt \
 +            setuptools
-           EOF
-           cat << "EOF" >> build.sh
            if [[ "${BUILDMAN}" != "" ]]; then
                ret=0;
                tools/buildman/buildman -o /tmp -PEWM ${BUILDMAN} ${OVERRIDE} || ret=$?;