mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-02 02:02:24 +00:00
Merge pull request #10597 from kata-containers/topic/unbreak-ci-3rd-time-s-a-charm
Unbreak the CI, 3rd attempt
This commit is contained in:
commit
bdf10e651a
@ -89,7 +89,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -181,7 +181,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -252,7 +252,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: shim-v2
|
KATA_ASSET: shim-v2
|
||||||
TAR_OUTPUT: shim-v2.tar.gz
|
TAR_OUTPUT: shim-v2.tar.gz
|
||||||
|
@ -61,7 +61,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -121,7 +121,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -189,7 +189,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: shim-v2
|
KATA_ASSET: shim-v2
|
||||||
TAR_OUTPUT: shim-v2.tar.gz
|
TAR_OUTPUT: shim-v2.tar.gz
|
||||||
|
@ -63,7 +63,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -129,7 +129,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -202,7 +202,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: shim-v2
|
KATA_ASSET: shim-v2
|
||||||
TAR_OUTPUT: shim-v2.tar.gz
|
TAR_OUTPUT: shim-v2.tar.gz
|
||||||
|
@ -67,7 +67,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -153,7 +153,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: ${{ matrix.asset }}
|
KATA_ASSET: ${{ matrix.asset }}
|
||||||
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
TAR_OUTPUT: ${{ matrix.asset }}.tar.gz
|
||||||
@ -268,7 +268,7 @@ jobs:
|
|||||||
make "${KATA_ASSET}-tarball"
|
make "${KATA_ASSET}-tarball"
|
||||||
build_dir=$(readlink -f build)
|
build_dir=$(readlink -f build)
|
||||||
# store-artifact does not work with symlink
|
# store-artifact does not work with symlink
|
||||||
cp -r --no-clobber "${build_dir}" "kata-build"
|
mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/.
|
||||||
env:
|
env:
|
||||||
KATA_ASSET: shim-v2
|
KATA_ASSET: shim-v2
|
||||||
TAR_OUTPUT: shim-v2.tar.gz
|
TAR_OUTPUT: shim-v2.tar.gz
|
||||||
|
@ -54,6 +54,11 @@ define BUILD
|
|||||||
$(MK_DIR)/kata-deploy-binaries-in-docker.sh $(if $(V),,-s) --build=$1
|
$(MK_DIR)/kata-deploy-binaries-in-docker.sh $(if $(V),,-s) --build=$1
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define DUMMY
|
||||||
|
$(call BUILD,"dummy")
|
||||||
|
mv $(MK_DIR)/build/kata-static-dummy.tar.xz $(MK_DIR)/build/kata-static-$(patsubst %-tarball,%,$1).tar.xz
|
||||||
|
endef
|
||||||
|
|
||||||
kata-tarball: | all-parallel merge-builds
|
kata-tarball: | all-parallel merge-builds
|
||||||
|
|
||||||
copy-scripts-for-the-agent-build:
|
copy-scripts-for-the-agent-build:
|
||||||
@ -94,7 +99,7 @@ cloud-hypervisor-glibc-tarball:
|
|||||||
${MAKE} $@-build
|
${MAKE} $@-build
|
||||||
|
|
||||||
csi-kata-directvolume-tarball: copy-scripts-for-the-tools-build
|
csi-kata-directvolume-tarball: copy-scripts-for-the-tools-build
|
||||||
exit 0
|
$(call DUMMY,$@)
|
||||||
|
|
||||||
firecracker-tarball:
|
firecracker-tarball:
|
||||||
${MAKE} $@-build
|
${MAKE} $@-build
|
||||||
|
@ -1191,6 +1191,10 @@ handle_build() {
|
|||||||
|
|
||||||
virtiofsd) install_virtiofsd ;;
|
virtiofsd) install_virtiofsd ;;
|
||||||
|
|
||||||
|
dummy)
|
||||||
|
tar cvfJ ${final_tarball_path} --files-from /dev/null
|
||||||
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
die "Invalid build target ${build_target}"
|
die "Invalid build target ${build_target}"
|
||||||
;;
|
;;
|
||||||
@ -1365,6 +1369,7 @@ main() {
|
|||||||
shim-v2
|
shim-v2
|
||||||
trace-forwarder
|
trace-forwarder
|
||||||
virtiofsd
|
virtiofsd
|
||||||
|
dummy
|
||||||
)
|
)
|
||||||
silent=false
|
silent=false
|
||||||
while getopts "hs-:" opt; do
|
while getopts "hs-:" opt; do
|
||||||
|
Loading…
Reference in New Issue
Block a user