Message ID | 20220112001431.1280749-2-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 9d358a8c26df56c01f3afd99c2f01b0cf03d35f6 |
Delegated to: | Tom Rini |
Headers | show |
Series | [1/4] ci: azure: Update to use stages | expand |
On Tue, Jan 11, 2022 at 9:14 PM Tom Rini <trini@konsulko.com> wrote: > > Bring us to the focial-20220105 tag and rebuild our images on top of s/focial/focal
On Tue, Jan 11, 2022 at 10:55:08PM -0300, Fabio Estevam wrote: > On Tue, Jan 11, 2022 at 9:14 PM Tom Rini <trini@konsulko.com> wrote: > > > > Bring us to the focial-20220105 tag and rebuild our images on top of > > s/focial/focal Whoops, thanks.
On Tue, Jan 11, 2022 at 07:14:29PM -0500, Tom Rini wrote: > Bring us to the focal-20220105 tag and rebuild our images on top of > this. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d97115668167..c0f72a811363 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-18.04 macos_vm: macOS-10.15 - ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20211006-14Nov2021 + ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20220105-10Jan2022 # 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 d06cca45fd04..4c44c01e7bf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://source.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:focal-20211006-14Nov2021 +image: trini/u-boot-gitlab-ci-runner:focal-20220105-10Jan2022 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index fb422e758813..f19e618ffba3 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:focal-20211006 +FROM ubuntu:focal-20220105 MAINTAINER Tom Rini <trini@konsulko.com> LABEL Description=" This image is for building U-Boot inside a container"
Bring us to the focial-20220105 tag and rebuild our images on top of this. Signed-off-by: Tom Rini <trini@konsulko.com> --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)