File tree Expand file tree Collapse file tree 5 files changed +42
-6
lines changed Expand file tree Collapse file tree 5 files changed +42
-6
lines changed Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ pipeline {
62
62
}
63
63
}
64
64
}
65
- stage (' AArch64 Unit Tests' ) {
65
+ stage (' AArch64 Tests' ) {
66
66
agent { node { label ' focal-arm64' } }
67
67
stages {
68
68
stage (' Checkout' ) {
@@ -75,6 +75,14 @@ pipeline {
75
75
sh " scripts/dev_cli.sh tests --unit"
76
76
}
77
77
}
78
+ stage(' Run integration tests' ) {
79
+ options {
80
+ timeout(time : 1 , unit : ' HOURS' )
81
+ }
82
+ steps {
83
+ sh " scripts/dev_cli.sh tests --integration"
84
+ }
85
+ }
78
86
}
79
87
}
80
88
}
Original file line number Diff line number Diff line change @@ -317,7 +317,7 @@ cmd_tests() {
317
317
shift
318
318
arg_vols=" $1 "
319
319
;;
320
- " --all" ) { cargo=true; unit=true; [ " $arch " = " x86_64 " ] && integration=true; } ;;
320
+ " --all" ) { cargo=true; unit=true; integration=true; } ;;
321
321
" --" ) { shift ; break ; } ;;
322
322
* )
323
323
die " Unknown tests argument: $1 . Please use --help for help."
@@ -326,10 +326,7 @@ cmd_tests() {
326
326
shift
327
327
done
328
328
329
- if [ " $( uname -m) " = " aarch64" ] ; then
330
- if [ " $integration " = true ] ; then
331
- die " Integration test is not supported for aarch64."
332
- fi
329
+ if [ " $arch " = " aarch64" ] ; then
333
330
if [ " $integration_coreboot " = true ] ; then
334
331
die " coreboot integration test is not supported for aarch64."
335
332
fi
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ fetch_ch() {
7
7
CH_VERSION=" v32.0"
8
8
CH_URL_BASE=" https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$CH_VERSION "
9
9
10
+ [ " $CH_ARCH " = " aarch64" ] && CH_NAME=" cloud-hypervisor-static-aarch64"
10
11
[ " $CH_ARCH " = " x86_64" ] && CH_NAME=" cloud-hypervisor"
11
12
CH_URL=" $CH_URL_BASE /$CH_NAME "
12
13
@@ -46,6 +47,11 @@ fetch_raw_ubuntu_image() {
46
47
convert_image " $OS_IMAGE_NAME " " $OS_RAW_IMAGE_NAME "
47
48
}
48
49
50
+ aarch64_fetch_disk_images () {
51
+ fetch_raw_ubuntu_image " focal" " arm64"
52
+ fetch_raw_ubuntu_image " jammy" " arm64"
53
+ }
54
+
49
55
x86_64_fetch_disk_images () {
50
56
CLEAR_OS_IMAGE_NAME=" clear-31311-cloudguest.img"
51
57
CLEAR_OS_URL_BASE=" https://cloud-hypervisor.azureedge.net/"
@@ -62,6 +68,7 @@ fetch_disk_images() {
62
68
63
69
pushd " $WORKLOADS_DIR "
64
70
71
+ [ " $ARCH " = " aarch64" ] && aarch64_fetch_disk_images
65
72
[ " $ARCH " = " x86_64" ] && x86_64_fetch_disk_images
66
73
67
74
popd
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ fetch_ch "$CH_PATH" "$arch"
14
14
15
15
fetch_disk_images " $WORKLOADS_DIR " " $arch "
16
16
17
+ [ " $arch " = " aarch64" ] && target=" aarch64-unknown-none"
17
18
[ " $arch " = " x86_64" ] && target=" x86_64-unknown-none"
18
19
19
20
rustup component add rust-src
Original file line number Diff line number Diff line change @@ -465,9 +465,13 @@ mod tests {
465
465
path : & ' a str ,
466
466
}
467
467
468
+ #[ cfg( target_arch = "aarch64" ) ]
469
+ const TARGET_TRIPLE : & str = "aarch64-unknown-none" ;
468
470
#[ cfg( target_arch = "x86_64" ) ]
469
471
const TARGET_TRIPLE : & str = "x86_64-unknown-none" ;
470
472
473
+ #[ cfg( target_arch = "aarch64" ) ]
474
+ const QEMU_NAME : & str = "qemu-system-aarch64" ;
471
475
#[ cfg( target_arch = "x86_64" ) ]
472
476
const QEMU_NAME : & str = "qemu-system-x86_64" ;
473
477
@@ -605,6 +609,25 @@ mod tests {
605
609
handle_child_output ( & tmp_dir, r, & output) ;
606
610
}
607
611
612
+ mod aarch64 {
613
+ use super :: * ;
614
+
615
+ const FOCAL_IMAGE_NAME : & str = "focal-server-cloudimg-arm64-raw.img" ;
616
+ const JAMMY_IMAGE_NAME : & str = "jammy-server-cloudimg-arm64-raw.img" ;
617
+
618
+ #[ test]
619
+ #[ cfg( not( feature = "coreboot" ) ) ]
620
+ fn test_boot_ch_focal ( ) {
621
+ test_boot ( FOCAL_IMAGE_NAME , & UbuntuCloudInit { } , spawn_ch)
622
+ }
623
+
624
+ #[ test]
625
+ #[ cfg( not( feature = "coreboot" ) ) ]
626
+ fn test_boot_ch_jammy ( ) {
627
+ test_boot ( JAMMY_IMAGE_NAME , & UbuntuCloudInit { } , spawn_ch)
628
+ }
629
+ }
630
+
608
631
mod x86_64 {
609
632
use super :: * ;
610
633
You can’t perform that action at this time.
0 commit comments