[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH TEST-ARTEFACTS] Drop legacy jobs
The CI improvements have been backported to all Xen branches. Remove the transitionary tar/cpio parameter in scripts/alpine-rootfs.sh Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- CC: Anthony PERARD <anthony.perard@xxxxxxxxxx> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx> CC: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> --- .gitlab-ci.yml | 27 +--------------- scripts/alpine-rootfs.sh | 23 ++++--------- scripts/x86_64-argo-linux.sh | 63 ------------------------------------ 3 files changed, 8 insertions(+), 105 deletions(-) delete mode 100755 scripts/x86_64-argo-linux.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcf76db6ec62..2e1aad800b95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ linux-6.6.86-arm64: alpine-3.18-x86_64-rootfs: extends: .x86_64-artifacts script: - - ./scripts/alpine-rootfs.sh cpio + - ./scripts/alpine-rootfs.sh variables: CONTAINER: alpine:3.18-x86_64-base @@ -67,28 +67,3 @@ linux-6.6.56-x86_64: microcode-x86: extends: .x86_64-artifacts script: ./scripts/x86-microcode.sh - -# -# The jobs below here are legacy and being phased out. -# -x86_64-kernel-linux-6.6.56: - extends: .x86_64-artifacts - script: ./scripts/build-linux.sh - variables: - LINUX_VERSION: 6.6.56 - -x86_64-rootfs-alpine-3.18: - extends: .x86_64-artifacts - script: - - ./scripts/alpine-rootfs.sh tar - variables: - CONTAINER: alpine:3.18-x86_64-base - -x86_64-argo-linux-6.6.56: - extends: .x86_64-artifacts - script: - - . scripts/x86_64-argo-linux.sh - variables: - LINUX_VERSION: 6.6.56 - ARGO_SHA: "705a7a8a624b42e13e655d3042059b8a85cdf6a3" - ARGOEXEC_SHA: "d900429f6640acc6f68a3d3a4c945d7da60625d8" diff --git a/scripts/alpine-rootfs.sh b/scripts/alpine-rootfs.sh index 13d39e8846e7..c304e2ebfbd9 100755 --- a/scripts/alpine-rootfs.sh +++ b/scripts/alpine-rootfs.sh @@ -77,20 +77,11 @@ passwd -d "root" root # Create rootfs cd / -case $1 in - cpio) - { - PATHS="bin etc home init lib mnt opt root sbin srv usr var" - find $PATHS -print0 - echo -ne "dev\0proc\0run\0sys\0" - } | cpio -0 -H newc -o | gzip > "${COPYDIR}/rootfs.cpio.gz" +{ + PATHS="bin etc home init lib mnt opt root sbin srv usr var" + find $PATHS -print0 + echo -ne "dev\0proc\0run\0sys\0" +} | cpio -0 -H newc -o | gzip > "${COPYDIR}/rootfs.cpio.gz" - # Print the contents for the build log - zcat "${COPYDIR}/rootfs.cpio.gz" | cpio -tv - ;; - - tar) - PATHS="bin dev etc home init lib mnt opt root sbin usr var" - tar cvzf "${COPYDIR}/initrd.tar.gz" $PATHS - ;; -esac +# Print the contents for the build log +zcat "${COPYDIR}/rootfs.cpio.gz" | cpio -tv diff --git a/scripts/x86_64-argo-linux.sh b/scripts/x86_64-argo-linux.sh deleted file mode 100755 index a110a3378192..000000000000 --- a/scripts/x86_64-argo-linux.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -if test -z "${LINUX_VERSION}" -then - >&2 echo "LINUX_VERSION must be set"; exit 1 -fi - -set -ex -o pipefail - -BUILDDIR="${PWD}" -COPYDIR="${BUILDDIR}/binaries/" - -# Prepare Linux sources -curl -fsSLO \ - https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"${LINUX_VERSION}".tar.xz -tar xJf linux-"${LINUX_VERSION}".tar.xz -cd linux-"${LINUX_VERSION}" -make ARCH=x86 defconfig -make ARCH=x86 xen.config -./scripts/config --enable BRIDGE -./scripts/config --enable IGC -./scripts/config --enable TUN -cp .config .config.orig -cat .config.orig \ - | grep 'XEN' \ - | grep '=m' \ - | sed 's/=m/=y/g' \ - >> .config -make ARCH=x86 olddefconfig -make ARCH=x86 modules_prepare - -# Build Linux kernel module for Xen Argo -cd "${BUILDDIR}" -git clone \ - --depth=1 --branch=master \ - https://github.com/OpenXT/linux-xen-argo.git -git -C "${BUILDDIR}/linux-xen-argo" switch --detach "${ARGO_SHA}" -make -C "linux-${LINUX_VERSION}" M="${BUILDDIR}/linux-xen-argo/argo-linux" \ - CFLAGS_MODULE="-Wno-error" KBUILD_MODPOST_WARN=1 -cp "linux-xen-argo/argo-linux/xen-argo.ko" "${COPYDIR}/xen-argo.ko" - -# Build Linux libargo shared library, applying fixes to build in Alpine Linux -cd "${BUILDDIR}/linux-xen-argo/libargo" -sed -i "s|AM_INIT_AUTOMAKE|AC_CONFIG_AUX_DIR(.)\nAM_INIT_AUTOMAKE|" configure.ac -sed -i "s/__SOCKADDR_COMMON (sxenargo_)/sa_family_t sxenargo_family/" src/libargo.h -sed -i "s/__SOCKADDR_COMMON_SIZE/(sizeof (unsigned short int))/" src/libargo.h -autoreconf --install -./configure --prefix="${COPYDIR}" CPPFLAGS="-I${PWD}/../argo-linux/include" -make -make install - -# Build Linux user program, modifying for xilinx argo test -cd "${BUILDDIR}" -wget "https://raw.githubusercontent.com/OpenXT/xenclient-oe/${ARGOEXEC_SHA}/\ -recipes-openxt/argo-exec/argo-exec/argo-exec.c" -sed -i "s|#include <xen/xen.h>||" argo-exec.c -sed -i "s|ret = shuffle(s, fds\[0\], fds\[1\]);|ret = shuffle(s, 0, 1);|" \ - argo-exec.c -gcc -I"${BUILDDIR}/linux-xen-argo/libargo/src" \ - -I"${BUILDDIR}/linux-xen-argo/argo-linux/include" \ - -L"${COPYDIR}/lib/" \ - -o argo-exec argo-exec.c -largo -cp argo-exec "${COPYDIR}" base-commit: 683a1f67a82e8ea151c818d74a50522ca2e67236 -- 2.39.5
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |