xen-argo.ko has moved into the standard location. In the short term, simply unpack argo.cpio.gz, but this can be simply concatinated with the base rootfs when it is constructed in a more convenient way.
No practical change. Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- 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: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com> CC: Jason Andryuk <jason.andr...@amd.com> CC: Daniel P. Smith <dpsm...@apertussolutions.com> https://gitlab.com/xen-project/hardware/xen-staging/-/jobs/9690063969 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 59a2de28c864..9a533eedb941 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -240,14 +240,11 @@ 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: x86_64-rootfs-alpine-3.18 ref: master - - project: xen-project/hardware/test-artifacts - job: x86_64-argo-linux-6.6.56 - ref: master adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7834ffbe0593..e97702f22827 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -66,7 +66,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,15 +74,13 @@ 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 () { - cp "${WORKDIR}/binaries/xen-argo.ko" "root/" - cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" - cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" + zcat ${WORKDIR}/binaries/argo.cpio.gz | cpio -idv } copy_domU_files () { copy_dom0_files; } else
