diff options
| author | Tom Rini <[email protected]> | 2025-11-26 17:49:58 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-07 08:09:12 -0600 |
| commit | cf3d4da03f3a51615350f19094023947fd00d08a (patch) | |
| tree | f7efcab54fb7213c0e114ea761d0e014355ae0bb | |
| parent | c5e6d2ab7eba68cbfb600cdc131c0c375ced2ec9 (diff) | |
Azure: Rework world build to directly use the container
While we had problems historically using buildman inside of a container
when invoked directly via Azure, rather than calling docker in our
script, that is no longer the case. We can make the job a bit easier to
understand by running it more normally. The challenge here is that our
container normally runs with an unprivileged user that we have populated
tools for and Azure creates and uses a new unprivileged user. Copy what
we need over to the new user.
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | .azure-pipelines.yml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 3f671dd078d..6348efff357 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -613,6 +613,9 @@ stages: displayName: 'Build the World' pool: vmImage: $(ubuntu_vm) + container: + image: $(ci_runner_image) + options: $(container_option) strategy: # We split the world up in to 10 jobs as we can have at most 10 # parallel jobs going on the free tier of Azure. @@ -639,18 +642,15 @@ stages: 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 - EOF - cat << "EOF" >> build.sh if [[ "${BUILDMAN}" != "" ]]; then ret=0; tools/buildman/buildman -o /tmp -PEWM ${BUILDMAN} ${OVERRIDE} || ret=$?; @@ -659,6 +659,3 @@ stages: exit $ret; fi; fi - EOF - cat build.sh - docker run -v $PWD:$(work_dir) $(ci_runner_image) /bin/bash $(work_dir)/build.sh |