Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: install -debug UVMs for kata images #5970

Draft
wants to merge 2 commits into
base: mitchzhu/kata-support
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .pipelines/templates/.builder-release-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,13 @@ steps:
itemPattern: |
**/kata-containers-igvm-debug.img**
**/igvm-measurement**
**/igvm-debug-measurement**
**/kata-containers-igvm.img**
**/kata-containers-cc.img**
**/kata-containers.img**
**/kata-containers-debug.img**
**/kata-containers-cc.img**
**/kata-containers-cc-debug.img**
**/kata-containers-initrd-base.img**
**/reference-info-base64**
downloadPath: $(Build.SourcesDirectory)
Expand Down
34 changes: 19 additions & 15 deletions vhdbuilder/packer/packer_source.sh
Original file line number Diff line number Diff line change
Expand Up @@ -160,27 +160,31 @@ copyPackerFiles() {
KATA_INITRD_SRC=/home/packer/kata-containers-initrd-base.img
KATA_INITRD_DEST=$KATA_CONFIG_DIR/kata-containers-initrd.img
cpAndMode $KATA_INITRD_SRC $KATA_INITRD_DEST 0755

KATACC_IMAGE_SRC=/home/packer/kata-containers.img
KATACC_IMAGE_DEST=$KATACC_CONFIG_DIR/kata-containers.img
cpAndMode $KATACC_IMAGE_SRC $KATACC_IMAGE_DEST 0755
elif [[ $OS_VERSION == "3.0" ]]; then
KATA_IMAGE_SRC=/home/packer/kata-containers.img
KATA_IMAGE_DEST=$KATA_CONFIG_DIR/kata-containers.img
cpAndMode $KATA_IMAGE_SRC $KATA_IMAGE_DEST 0755

KATACC_IMAGE_SRC=/home/packer/kata-containers-cc.img
KATACC_IMAGE_DEST=$KATACC_CONFIG_DIR/kata-containers.img
cpAndMode $KATACC_IMAGE_SRC $KATACC_IMAGE_DEST 0755
fi

IGVM_BIN_SRC=/home/packer/kata-containers-igvm.img
IGVM_BIN_DEST=$KATACC_CONFIG_DIR/kata-containers-igvm.img
cpAndMode $IGVM_BIN_SRC $IGVM_BIN_DEST 0755

IGVM_DEBUG_BIN_SRC=/home/packer/kata-containers-igvm-debug.img
IGVM_DEBUG_BIN_DEST=$KATACC_CONFIG_DIR/kata-containers-igvm-debug.img
cpAndMode $IGVM_DEBUG_BIN_SRC $IGVM_DEBUG_BIN_DEST 0755

IGVM_BIN_SRC=/home/packer/kata-containers-igvm.img
IGVM_BIN_DEST=$KATACC_CONFIG_DIR/kata-containers-igvm.img
cpAndMode $IGVM_BIN_SRC $IGVM_BIN_DEST 0755
KATA_IMAGE_SRC=/home/packer/kata-containers.img
KATA_IMAGE_DEST=$KATA_CONFIG_DIR/kata-containers.img
cpAndMode $KATA_IMAGE_SRC $KATA_IMAGE_DEST 0755

KATA_DBG_IMAGE_SRC=/home/packer/kata-containers-debug.img
KATA_DBG_IMAGE_DEST=$KATA_CONFIG_DIR/kata-containers-debug.img
cpAndMode $KATA_DBG_IMAGE_SRC $KATA_DBG_IMAGE_DEST 0755

KATACC_IMAGE_SRC=/home/packer/kata-containers-cc.img
KATACC_IMAGE_DEST=$KATACC_CONFIG_DIR/kata-containers-cc.img
cpAndMode $KATACC_IMAGE_SRC $KATACC_IMAGE_DEST 0755

KATACC_DBG_IMAGE_SRC=/home/packer/kata-containers-cc-debug.img
KATACC_DBG_IMAGE_DEST=$KATACC_CONFIG_DIR/kata-containers-cc-debug.img
cpAndMode $KATACC_DBG_IMAGE_SRC $KATACC_DBG_IMAGE_DEST 0755

REF_INFO_SRC=/home/packer/reference-info-base64
REF_INFO_DEST=$KATACC_CONFIG_DIR/reference-info-base64
Expand Down
12 changes: 11 additions & 1 deletion vhdbuilder/packer/vhd-image-builder-mariner.json
Original file line number Diff line number Diff line change
Expand Up @@ -570,11 +570,21 @@
"source": "kata-containers.img",
"destination": "/home/packer/kata-containers.img"
},
{
"type": "file",
"source": "kata-containers-debug.img",
"destination": "/home/packer/kata-containers-debug.img"
},
{
"type": "file",
"source": "kata-containers-cc.img",
"destination": "/home/packer/kata-containers-cc.img"
},
{
"type": "file",
"source": "kata-containers-cc-debug.img",
"destination": "/home/packer/kata-containers-cc-debug.img"
},
{
"type": "file",
"source": "reference-info-base64",
Expand Down Expand Up @@ -667,4 +677,4 @@
]
}
]
}
}