| Message ID | 20250414110903.2355303-5-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | CI: switch to CPIO archives | expand |
On Mon, Apr 14, 2025 at 12:09:01PM +0100, Andrew Cooper wrote: > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml > index 51229cbe561d..d46da1c43d05 100644 > --- a/automation/gitlab-ci/test.yaml > +++ b/automation/gitlab-ci/test.yaml > @@ -242,7 +242,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: > needs: > - alpine-3.18-gcc-debug > - project: xen-project/hardware/test-artifacts > - job: x86_64-kernel-linux-6.6.56 > + job: linux-6.6.56-x86_64 > ref: master > - project: xen-project/hardware/test-artifacts > job: alpine-3.18-x86_64-rootfs Don't you need to remove the dependency on "x86_64-argo-linux-6.6.56" which is just out of context, as I think this is now part of "linux-6.6.56-x86_64" job. Besides that: Reviewed-by: Anthony PERARD <anthony.perard@vates.tech> Thanks,
On 14/04/2025 6:24 pm, Anthony PERARD wrote: > On Mon, Apr 14, 2025 at 12:09:01PM +0100, Andrew Cooper wrote: >> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml >> index 51229cbe561d..d46da1c43d05 100644 >> --- a/automation/gitlab-ci/test.yaml >> +++ b/automation/gitlab-ci/test.yaml >> @@ -242,7 +242,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: >> needs: >> - alpine-3.18-gcc-debug >> - project: xen-project/hardware/test-artifacts >> - job: x86_64-kernel-linux-6.6.56 >> + job: linux-6.6.56-x86_64 >> ref: master >> - project: xen-project/hardware/test-artifacts >> job: alpine-3.18-x86_64-rootfs > > Don't you need to remove the dependency on "x86_64-argo-linux-6.6.56" > which is just out of context, as I think this is now part of > "linux-6.6.56-x86_64" job. Yes. Sorry, this was a bad rebase taking out my "ref: andrewcoop-test"'s through the series. > > Besides that: > Reviewed-by: Anthony PERARD <anthony.perard@vates.tech> Thanks. ~Andrew
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 51229cbe561d..d46da1c43d05 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -242,7 +242,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: needs: - alpine-3.18-gcc-debug - project: xen-project/hardware/test-artifacts - job: x86_64-kernel-linux-6.6.56 + job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 1fc52d78db16..85007dcc290a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,8 +28,6 @@ extra = "root=/dev/ram0 console=hvc0" memory = 512 ' DOMU_CFG_EXTRA="" -copy_domU_files () { :; } -copy_dom0_files () { :; } # Select test variant. if [ "${TEST}" = "ping" ]; then @@ -66,7 +64,7 @@ then PASS_MSG="TEST: Message from DOMU" XEN_CMD_EXTRA="argo=1,mac-permissive=1" DOMU_CMD=" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko until false do echo \"${PASS_MSG}\" @@ -74,24 +72,19 @@ do done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " -copy_dom0_files () -{ - mkdir -p root usr/local/lib usr/local/bin - cp "${WORKDIR}/binaries/xen-argo.ko" "root/" - cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" - cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" -} -copy_domU_files () { copy_dom0_files; } else fatal "Unknown test: ${TEST}" fi # DomU rootfs cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz +if [[ "${TEST}" == argo ]]; then + cat binaries/argo.cpio.gz >> binaries/domU-rootfs.cpio.gz +fi # test-local configuration mkdir -p rootfs @@ -108,13 +101,15 @@ echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue -copy_domU_files find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +if [[ "${TEST}" == argo ]]; then + cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz +fi # test-local configuration mkdir -p rootfs @@ -134,7 +129,6 @@ echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -copy_dom0_files find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd ..
The argo artefact is now a cpio archive and can be appended to dom?-rootfs directly, rather than being part of of the overlay. Drop the copy_dom?_files() functions. xen-argo.ko has moved into the standard location, so update the insmod path. No practical change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Anthony PERARD <anthony.perard@vates.tech> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Michal Orzel <michal.orzel@amd.com> CC: Doug Goldstein <cardoe@cardoe.com> CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> CC: Jason Andryuk <jason.andryuk@amd.com> CC: Daniel P. Smith <dpsmith@apertussolutions.com> v3: * Rebase over change to rootfs handling https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1766180593 --- automation/gitlab-ci/test.yaml | 2 +- .../scripts/xilinx-smoke-dom0-x86_64.sh | 22 +++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-)