On Thu, 31 Oct 2024, Andrew Cooper wrote: > The Argo work already moved this artefact into the new form. Reuse that, and > drop one test job. > > Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
This is good but should we also remove automation/tests-artifacts/alpine/3.18.dockerfile since we are at it? > --- > CC: Anthony PERARD <anthony.per...@vates.tech> > CC: Stefano Stabellini <sstabell...@kernel.org> > CC: Michal Orzel <michal.or...@amd.com> > CC: Doug Goldstein <car...@cardoe.com> > CC: Victor Lira <victorm.l...@amd.com> > CC: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com> > > https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1522281815 > --- > automation/gitlab-ci/build.yaml | 11 ----------- > automation/gitlab-ci/test.yaml | 4 +++- > 2 files changed, 3 insertions(+), 12 deletions(-) > > diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml > index af2b1ceba3a4..b5ca2c3f1833 100644 > --- a/automation/gitlab-ci/build.yaml > +++ b/automation/gitlab-ci/build.yaml > @@ -304,17 +304,6 @@ qemu-system-aarch64-6.0.0-arm32-export: > > # x86_64 test artifacts > > -alpine-3.18-rootfs-export: > - extends: .test-jobs-artifact-common > - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18 > - script: > - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz > - artifacts: > - paths: > - - binaries/initrd.tar.gz > - tags: > - - x86_64 > - > kernel-6.1.19-export: > extends: .test-jobs-artifact-common > image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml > index e8f57e87bd19..fe023dae0d42 100644 > --- a/automation/gitlab-ci/test.yaml > +++ b/automation/gitlab-ci/test.yaml > @@ -11,8 +11,10 @@ > - qemu-system-aarch64-6.0.0-arm32-export > > .x86-64-test-needs: &x86-64-test-needs > - - alpine-3.18-rootfs-export > - kernel-6.1.19-export > + - project: xen-project/hardware/test-artifacts > + job: x86_64-rootfs-alpine-3.18 > + ref: master > > .qemu-arm64: > extends: .test-jobs-common > -- > 2.39.5 >