mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-07-07 10:15:45 +00:00
tests: Move Windows integration test to updated OVMF
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
030a86db17
commit
99baee8d37
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -149,7 +149,7 @@ pipeline{
|
|||||||
sh "mkdir ${env.HOME}/workloads"
|
sh "mkdir ${env.HOME}/workloads"
|
||||||
azureDownload(storageCredentialId: 'ch-image-store',
|
azureDownload(storageCredentialId: 'ch-image-store',
|
||||||
containerName: 'private-images',
|
containerName: 'private-images',
|
||||||
includeFilesPattern: 'OVMF.fd',
|
includeFilesPattern: 'OVMF-4b47d0c6c8.fd',
|
||||||
downloadType: 'container',
|
downloadType: 'container',
|
||||||
downloadDirLoc: "${env.HOME}/workloads")
|
downloadDirLoc: "${env.HOME}/workloads")
|
||||||
azureDownload(storageCredentialId: 'ch-image-store',
|
azureDownload(storageCredentialId: 'ch-image-store',
|
||||||
|
@ -10,7 +10,7 @@ features_build=""
|
|||||||
features_test="--features integration_tests"
|
features_test="--features integration_tests"
|
||||||
|
|
||||||
WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw"
|
WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw"
|
||||||
OVMF_FW_FILE="/root/workloads/OVMF.fd"
|
OVMF_FW_FILE="/root/workloads/OVMF-4b47d0c6c8.fd"
|
||||||
BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
|
BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
TARGET_CC=""
|
TARGET_CC=""
|
||||||
|
@ -102,6 +102,8 @@ mod tests {
|
|||||||
const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210106-1.vhd";
|
const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210106-1.vhd";
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw";
|
const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw";
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
const OVMF_NAME: &str = "OVMF-4b47d0c6c8.fd";
|
||||||
|
|
||||||
const DIRECT_KERNEL_BOOT_CMDLINE: &str =
|
const DIRECT_KERNEL_BOOT_CMDLINE: &str =
|
||||||
"root=/dev/vda1 console=hvc0 rw systemd.journald.forward_to_console=1";
|
"root=/dev/vda1 console=hvc0 rw systemd.journald.forward_to_console=1";
|
||||||
@ -6112,7 +6114,7 @@ mod tests {
|
|||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut ovmf_path = workload_path.clone();
|
let mut ovmf_path = workload_path.clone();
|
||||||
ovmf_path.push("OVMF.fd");
|
ovmf_path.push(OVMF_NAME);
|
||||||
|
|
||||||
let mut osdisk_path = workload_path;
|
let mut osdisk_path = workload_path;
|
||||||
osdisk_path.push(WINDOWS_IMAGE_NAME.to_string());
|
osdisk_path.push(WINDOWS_IMAGE_NAME.to_string());
|
||||||
@ -6166,7 +6168,7 @@ mod tests {
|
|||||||
workload_path.push("workloads");
|
workload_path.push("workloads");
|
||||||
|
|
||||||
let mut ovmf_path = workload_path.clone();
|
let mut ovmf_path = workload_path.clone();
|
||||||
ovmf_path.push("OVMF.fd");
|
ovmf_path.push(OVMF_NAME);
|
||||||
|
|
||||||
let mut osdisk_path = workload_path;
|
let mut osdisk_path = workload_path;
|
||||||
osdisk_path.push(WINDOWS_IMAGE_NAME.to_string());
|
osdisk_path.push(WINDOWS_IMAGE_NAME.to_string());
|
||||||
|
Loading…
Reference in New Issue
Block a user