diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index f86c8b125..47d264060 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -22,7 +22,7 @@ jobs: - kernel-dragonball-experimental - kernel-tdx-experimental - kernel-gpu-snp - - kernel-gpu-tdx + - kernel-gpu-tdx-experimental - nydus - qemu - qemu-tdx-experimental diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f9e810aad..f31261d51 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,7 +78,7 @@ jobs: mv kata-static.tar.xz "$GITHUB_WORKSPACE/${tarball}" pushd $GITHUB_WORKSPACE echo "uploading asset '${tarball}' for tag: ${tag}" - GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}" + GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}" popd upload-cargo-vendored-tarball: diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 02c36e417..8451ae7ce 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -27,7 +27,7 @@ all: serial-targets \ kernel-dragonball-experimental-tarball \ kernel-tdx-experimental-tarball \ kernel-gpu-snp-tarball \ - kernel-gpu-tdx-tarball \ + kernel-gpu-tdx-experimental-tarball \ nydus-tarball \ qemu-tarball \ qemu-tdx-experimental-tarball \ @@ -59,8 +59,8 @@ kernel-dragonball-experimental-tarball: kernel-gpu-snp-tarball: ${MAKE} $@-build -kernel-gpu-tdx-tarball: - ${MAKE} $@-build +kernel-gpu-tdx-experimental-tarball: + ${MAKE} $@-build kernel-experimental-tarball: ${MAKE} $@-build diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 534b7cfd0..350a7d6ae 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -82,8 +82,9 @@ options: kernel-dragonball-experimental kernel-experimental kernel-tdx-experimental + kernel-gpu kernel-gpu-snp - kernel-gpu-tdx + kernel-gpu-tdx-experimental nydus qemu qemu-tdx-experimental @@ -225,8 +226,8 @@ install_kernel_gpu_snp() { "-x snp -g nvidia -u ${kernel_url} -H deb" } -#Install GPU and TDX enabled kernel asset -install_kernel_gpu_tdx() { +#Install GPU and TDX experimental enabled kernel asset +install_kernel_gpu_tdx_experimental() { local kernel_url="$(get_from_kata_deps assets.kernel-tdx-experimental.url)" install_kernel_helper \ @@ -472,7 +473,7 @@ handle_build() { kernel-gpu-snp) install_kernel_gpu_snp;; - kernel-gpu-tdx) install_kernel_gpu_tdx;; + kernel-gpu-tdx-experimental) install_kernel_gpu_tdx_experimental;; qemu) install_qemu ;; diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh index 2f3e0e353..67c4c8f5c 100755 --- a/tools/packaging/kernel/build-kernel.sh +++ b/tools/packaging/kernel/build-kernel.sh @@ -510,8 +510,6 @@ install_kata() { ls -la "${install_path}/vmlinux${suffix}.container" ls -la "${install_path}/vmlinuz${suffix}.container" popd >>/dev/null - - set +x } main() { @@ -588,7 +586,7 @@ main() { if [ -n "$kernel_version" ]; then kernel_major_version=$(get_major_kernel_version "${kernel_version}") if [[ ${kernel_major_version} != "5.10" ]]; then - info "dragonball-experimental kernel patches are only tested on 5.10.x kernel now, other kernel version may cause confliction" + info "dragonball-experimental kernel patches are only tested on 5.10.x kernel now, other kernel version may cause confliction" fi fi fi