github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-19 18:01:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7394 from fidencio/topic/ship-VERSIOB-and-versions.yaml-as-part-of-release-tarball

Browse Source 
kata-deploy: Add VERSION and versions.yaml to the final tarball
This commit is contained in:
GabyCT 2023-07-20 14:38:21 -06:00 committed by GitHub
commit f95a7896b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-kata-static-tarball-amd64.yaml vendored
View File

@ -99,7 +99,7 @@ jobs:
path: kata-artifacts
- name: merge-artifacts
run: |
./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts
./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
- name: store-artifacts
uses: actions/upload-artifact@v3
with:

2
.github/workflows/build-kata-static-tarball-arm64.yaml vendored
View File

@ -83,7 +83,7 @@ jobs:
path: kata-artifacts
- name: merge-artifacts
run: |
./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts
./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
- name: store-artifacts
uses: actions/upload-artifact@v3
with:

2
.github/workflows/build-kata-static-tarball-s390x.yaml vendored
View File

@ -80,7 +80,7 @@ jobs:
path: kata-artifacts
- name: merge-artifacts
run: |
./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts
./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
- name: store-artifacts
uses: actions/upload-artifact@v3
with:

13
.github/workflows/release.yaml vendored
View File

@ -121,6 +121,19 @@ jobs:
GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}"
popd
upload-versions-yaml-tarball:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: upload versions.yaml
run: |
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
pushd $GITHUB_WORKSPACE
versions_file="kata-containers-$tag-versions.yaml"
cp versions.yaml ${versions_file}
hub release edit -m "" -a "${versions_file}" "${tag}"
popd
upload-cargo-vendored-tarball:
needs: upload-multi-arch-static-tarball
runs-on: ubuntu-latest

5
tools/packaging/kata-deploy/local-build/Makefile
View File

@ -64,9 +64,6 @@ firecracker-tarball:
kernel-dragonball-experimental-tarball:
${MAKE} $@-build
kernel-experimental-tarball:
${MAKE} $@-build
kernel-nvidia-gpu-tarball:
${MAKE} $@-build
@ -128,7 +125,7 @@ virtiofsd-tarball:
${MAKE} $@-build
merge-builds:
$(MK_DIR)/kata-deploy-merge-builds.sh build
$(MK_DIR)/kata-deploy-merge-builds.sh build "$(MK_DIR)/../../../../versions.yaml"
install-tarball:
tar -xf ./kata-static.tar.xz -C /

10
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -346,14 +346,6 @@ install_kernel_nvidia_gpu_tdx_experimental() {
"-x tdx -g nvidia -u ${kernel_url} -H deb"
}
#Install experimental kernel asset
install_kernel_experimental() {
install_kernel_helper \
"assets.kernel-experimental.version" \
"kernel-experimental" \
"-f -b experimental"
}
#Install experimental TDX kernel asset
install_kernel_tdx_experimental() {
local kernel_url="$(get_from_kata_deps assets.kernel-tdx-experimental.url)"
@ -648,8 +640,6 @@ handle_build() {
kernel-dragonball-experimental) install_kernel_dragonball_experimental ;;
kernel-experimental) install_kernel_experimental ;;
kernel-nvidia-gpu) install_kernel_nvidia_gpu ;;
kernel-nvidia-gpu-snp) install_kernel_nvidia_gpu_snp;;

11
tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh
View File

@ -11,6 +11,8 @@ set -o pipefail
set -o errtrace
kata_build_dir=${1:-build}
kata_versions_yaml_file=${2:-""}
tar_path="${PWD}/kata-static.tar.xz"
pushd "${kata_build_dir}"
@ -24,6 +26,15 @@ do
tar -xvf "${c}" -C "${tarball_content_dir}"
done
pushd ${tarball_content_dir}
shim="containerd-shim-kata-v2"
shim_path=$(find . -name ${shim} | sort | head -1)
prefix=${shim_path%"bin/${shim}"}
echo "$(git describe)" > ${prefix}/VERSION
[[ -n "${kata_versions_yaml_file}" ]] && cp ${kata_versions_yaml_file} ${prefix}/
popd
echo "create ${tar_path}"
(cd "${tarball_content_dir}"; tar cvfJ "${tar_path}" .)
popd

5
versions.yaml
View File

@ -179,11 +179,6 @@ assets:
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
version: "v5.19.2"
kernel-experimental:
description: "Linux kernel with virtio-fs support"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
tag: "v5.13.10"
kernel-arm-experimental:
description: "Linux kernel with cpu/mem hotplug support on arm64"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"