move to funcs, add pflash test

1 files changed, 21 insertions, 8 deletions

diff --git a/jenkinsfile.edk2 b/jenkinsfile.edk2
index 3ae797e..4651970 100644
--- a/jenkinsfile.edk2
+++ b/jenkinsfile.edk2
@@ -7,6 +7,19 @@ def TestSimpleX64(args) {
     """
 }
 
+def TestFlashX64(args) {
+    sh """
+	code=\$(echo edk2/Build/OvmfX64/*/FV/OVMF_CODE.fd)
+	vars=\$(echo edk2/Build/OvmfX64/*/FV/OVMF_VARS.fd)
+	qcow="test-flash-vars-\$\$.qcow2"
+	qemu-img create -f qcow2 -b "\${vars}" "\${qcow}"
+	scripts/qemu-boot-kernel $args \
+	    -drive file=\${code},if=pflash,format=raw,unit=0,readonly=on \
+	    -drive file=\${qcow},if=pflash,format=raw,unit=1
+	rm -f "\${vars}"
+    """
+}
+
 pipeline {
 
     agent {
@@ -65,19 +78,19 @@ pipeline {
 
 	stage ('Test q35') {
 	    steps {
-		sh '''
-		    scripts/qemu-boot-kernel -M q35 \
-			-bios edk2/Build/OvmfX64/*/FV/OVMF.fd
-                '''
+		TestSimpleX64("-M q35")
 	    }
 	}
 
 	stage ('Test q35 smp4') {
 	    steps {
-		sh '''
-		    scripts/qemu-boot-kernel -M q35 -smp 4 \
-			-bios edk2/Build/OvmfX64/*/FV/OVMF.fd
-                '''
+		TestSimpleX64("-M q35 -smp 4")
+	    }
+	}
+
+	stage ('Test q35 smp4 pflash') {
+	    steps {
+		TestFlashX64("-M q35 -smp 4")
 	    }
 	}
     }