mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-03 20:15:45 +00:00
build: Use OVMF binary released from edk2 repo
Fixes: #3415 Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
7b5e8a3ca8
commit
eea2907daf
25
Jenkinsfile
vendored
25
Jenkinsfile
vendored
@ -34,17 +34,7 @@ pipeline{
|
|||||||
checkout scm
|
checkout scm
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage ('Install azure-cli') {
|
|
||||||
steps {
|
|
||||||
installAzureCli()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage ('Download assets') {
|
|
||||||
steps {
|
|
||||||
sh "mkdir ${env.HOME}/workloads"
|
|
||||||
sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-83041af43c.fd" --name OVMF-83041af43c.fd --connection-string "$AZURE_CONNECTION_STRING"'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage ('Run OpenAPI tests') {
|
stage ('Run OpenAPI tests') {
|
||||||
steps {
|
steps {
|
||||||
sh "scripts/run_openapi_tests.sh"
|
sh "scripts/run_openapi_tests.sh"
|
||||||
@ -107,17 +97,7 @@ pipeline{
|
|||||||
checkout scm
|
checkout scm
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage ('Install azure-cli') {
|
|
||||||
steps {
|
|
||||||
installAzureCli()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage ('Download assets') {
|
|
||||||
steps {
|
|
||||||
sh "mkdir ${env.HOME}/workloads"
|
|
||||||
sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-83041af43c.fd" --name OVMF-83041af43c.fd --connection-string "$AZURE_CONNECTION_STRING"'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage ('Run unit tests for musl') {
|
stage ('Run unit tests for musl') {
|
||||||
steps {
|
steps {
|
||||||
sh "scripts/dev_cli.sh tests --unit --libc musl"
|
sh "scripts/dev_cli.sh tests --unit --libc musl"
|
||||||
@ -225,7 +205,6 @@ pipeline{
|
|||||||
stage ('Download assets') {
|
stage ('Download assets') {
|
||||||
steps {
|
steps {
|
||||||
sh "mkdir ${env.HOME}/workloads"
|
sh "mkdir ${env.HOME}/workloads"
|
||||||
sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-83041af43c.fd" --name OVMF-83041af43c.fd --connection-string "$AZURE_CONNECTION_STRING"'
|
|
||||||
sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2019.raw" --name windows-server-2019.raw --connection-string "$AZURE_CONNECTION_STRING"'
|
sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2019.raw" --name windows-server-2019.raw --connection-string "$AZURE_CONNECTION_STRING"'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,16 @@ if [ "$hypervisor" = "mshv" ] ; then
|
|||||||
features_test="--no-default-features --features mshv,common,integration_tests"
|
features_test="--no-default-features --features mshv,common,integration_tests"
|
||||||
fi
|
fi
|
||||||
WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw"
|
WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw"
|
||||||
OVMF_FW_FILE="/root/workloads/OVMF-83041af43c.fd"
|
|
||||||
|
WORKLOADS_DIR="/root/workloads"
|
||||||
|
OVMF_FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/edk2/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
|
||||||
|
OVMF_FW="$WORKLOADS_DIR/OVMF.fd"
|
||||||
|
if [ ! -f "$OVMF_FW" ]; then
|
||||||
|
pushd $WORKLOADS_DIR
|
||||||
|
time wget --quiet $OVMF_FW_URL || exit 1
|
||||||
|
popd
|
||||||
|
fi
|
||||||
|
|
||||||
BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
|
BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
TARGET_CC=""
|
TARGET_CC=""
|
||||||
@ -24,7 +33,7 @@ CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if the images are present
|
# Check if the images are present
|
||||||
if [[ ! -f ${WIN_IMAGE_FILE} || ! -f ${OVMF_FW_FILE} ]]; then
|
if [[ ! -f ${WIN_IMAGE_FILE} || ! -f ${OVMF_FW} ]]; then
|
||||||
echo "Windows image/firmware not present in the host"
|
echo "Windows image/firmware not present in the host"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -30,6 +30,14 @@ if [ ! -f "$FW" ]; then
|
|||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
OVMF_FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/edk2/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
|
||||||
|
OVMF_FW="$WORKLOADS_DIR/OVMF.fd"
|
||||||
|
if [ ! -f "$OVMF_FW" ]; then
|
||||||
|
pushd $WORKLOADS_DIR
|
||||||
|
time wget --quiet $OVMF_FW_URL || exit 1
|
||||||
|
popd
|
||||||
|
fi
|
||||||
|
|
||||||
BIONIC_OS_IMAGE_NAME="bionic-server-cloudimg-amd64.qcow2"
|
BIONIC_OS_IMAGE_NAME="bionic-server-cloudimg-amd64.qcow2"
|
||||||
BIONIC_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$BIONIC_OS_IMAGE_NAME"
|
BIONIC_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$BIONIC_OS_IMAGE_NAME"
|
||||||
BIONIC_OS_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_IMAGE_NAME"
|
BIONIC_OS_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_IMAGE_NAME"
|
||||||
|
@ -63,7 +63,7 @@ mod tests {
|
|||||||
pub const FOCAL_IMAGE_NAME_VHDX: &str =
|
pub const FOCAL_IMAGE_NAME_VHDX: &str =
|
||||||
"focal-server-cloudimg-amd64-custom-20210609-0.vhdx";
|
"focal-server-cloudimg-amd64-custom-20210609-0.vhdx";
|
||||||
pub const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw";
|
pub const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw";
|
||||||
pub const OVMF_NAME: &str = "OVMF-83041af43c.fd";
|
pub const OVMF_NAME: &str = "OVMF.fd";
|
||||||
pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'IO-APIC.*ttyS0' /proc/interrupts || true";
|
pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'IO-APIC.*ttyS0' /proc/interrupts || true";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user