diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-17 11:10:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-17 11:10:32 -0400 |
| commit | 17196e446b6ea11220c3e08cebff839f999e0185 (patch) | |
| tree | ff76bb4adf08090f7df195c376dfa9480acae7d6 | |
| parent | 33799266021c390aa355696b6d722169745ddf1e (diff) | |
| download | u-boot-17196e446b6ea11220c3e08cebff839f999e0185.tar.gz | |
CI: Update to jammy-20221003-17Oct2022 tagWIP/17Oct2022
This includes python3-pyelftools so we can drop it from one of the tests
directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index f200b40dbb2..bda762451fd 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-22.04 macos_vm: macOS-12 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20221003-07Oct2022 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20221003-17Oct2022 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7052a6061cb..6f4c34fc4a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: trini/u-boot-gitlab-ci-runner:jammy-20221003-07Oct2022 +image: trini/u-boot-gitlab-ci-runner:jammy-20221003-17Oct2022 # We run some tests in different order, to catch some failures quicker. stages: @@ -92,7 +92,6 @@ build all 64bit ARM platforms: script: - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate - - pip install pyelftools - ret=0; ./tools/buildman/buildman -o /tmp -P -E -W aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then |