On Wed, Dec 18, 2024 at 04:38:02PM +0100, Quentin Schulz wrote: > > > On 12/18/24 4:30 PM, Tom Rini wrote: > > On Wed, Dec 18, 2024 at 08:08:02AM -0700, Simon Glass wrote: > > > This board has two variants, one of which boots with tpl. Labgrid gets > > > upset when they both try to claim the same hardware, so we might need to > > > see if we can handle that cleanly, e.g. by making the job wait. > > > > > > Signed-off-by: Simon Glass <s...@chromium.org> > > > --- > > > > > > .gitlab-ci.yml | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > > index c620cfd1e34..72959427951 100644 > > > --- a/.gitlab-ci.yml > > > +++ b/.gitlab-ci.yml > > > @@ -593,6 +593,12 @@ samus: > > > ROLE: samus > > > <<: *lab_dfn > > > +# chromebook_samus_tpl > > > +samus_tpl: > > > > I think you can just add: > > needs: [ "samus" ] > > here and gitlab should get the ordering right, but I didn't pass it > > through the validator. > > > > You probably want to not fetch artifacts from samus job though, so disable > artifact downloading (if there's any), c.f. > https://docs.gitlab.com/ee/ci/yaml/#needsartifacts > > or use a resource_group, c.f. > https://docs.gitlab.com/ee/ci/yaml/#resource_group > > you could have > > resource_group: samus > > in both jobs for example. I think this matches more the expectation?
Yup, that looks right, thanks! -- Tom
signature.asc
Description: PGP signature