Changeset 98992 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Mar 15, 2023 3:53:43 PM (2 years ago)

Author:

vboxsync

Message:

ValidationKit: Add Linux test VMs which have Secure Boot enabled, bugref:10287.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

@@ -83 +83 @@
 
         # Wether to reboot guest after Guest Additions installation.
-        self.fRebbotAfterInstall = True;
+        self.fRebootAfterInstall = True;
 
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
@@ -119 +119 @@
 
         elif asArgs[iArg] == '--no-reboot-after-install':
-            self.fRebbotAfterInstall = False;
+            self.fRebootAfterInstall = False;
             reporter.log('Guest will not be rebooted after Guest Additions installation, ' +
                          'kernel modules and user services should be reloaded automatically without reboot');
@@ -491 +491 @@
         # The actual install.
         # Also tell the installer to produce the appropriate log files.
-        #
+
+        # Deploy signing keys into guest if VM has Secure Boot enabled.
+        if oTestVm.fSecureBoot:
+            reporter.log('Deploying Secure Boot signing keys to the guest');
+            fRc = self.txsMkDirPath(oSession, oTxsSession, '/var/lib/shim-signed/mok');
+            if fRc:
+                fRc = self.txsUploadFile(oSession, oTxsSession,
+                                         self.getFullResourceName(oTestVm.sUefiMokPathPrefix) + '.der',
+                                         '/var/lib/shim-signed/mok/MOK.der')
+            if fRc:
+                fRc = self.txsUploadFile(oSession, oTxsSession,
+                                         self.getFullResourceName(oTestVm.sUefiMokPathPrefix) + '.priv',
+                                         '/var/lib/shim-signed/mok/MOK.priv')
+            if fRc and oTxsSession.isSuccess():
+                pass
+            else:
+                reporter.testFailure('Unable to deploy Secure Boot signing keys to the guest');
+
         # Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking
         # xterm window spawned.
@@ -498 +515 @@
                               (self.getGuestSystemShell(oTestVm),
                               '${CDROM}/%s/VBoxLinuxAdditions.run' % self.sGstPathGaPrefix, '--nox11'));
-        if not fRc:
-            iRc = self.getAdditionsInstallerResult(oTxsSession);
-            # Check for rc == 0 just for completeness.
-            if iRc in (0, 2): # Can happen if the GA installer has detected older VBox kernel modules running and needs a reboot.
-                reporter.log('Guest has old(er) VBox kernel modules still running; requires a reboot');
-                fRc = True;
+        if fRc and oTxsSession.isSuccess():
+            reporter.log('Installation completed');
+        else:
+            # Guest Additions installer which requires guest reboot after installation might return
+            # special exit code which can indicate that all was installed, but kernel modules were
+            # not rebooted. Handle this case here.
+            if self.fRebootAfterInstall:
+                iRc = self.getAdditionsInstallerResult(oTxsSession);
+                # Check for rc == 0 just for completeness.
+                if iRc in (0, 2): # Can happen if the GA installer has detected older VBox kernel modules running and needs a reboot.
+                    reporter.log('Guest has old(er) VBox kernel modules still running; requires a reboot');
+                    fRc = True;
 
             if not fRc:
@@ -519 +542 @@
         # Do the final reboot to get the just installed Guest Additions up and running.
         if fRc:
-            if self.fRebbotAfterInstall:
+            if self.fRebootAfterInstall:
                 reporter.testStart('Rebooting guest w/ updated Guest Additions active');
                 (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000);
@@ -530 +553 @@
                                       (self.getGuestSystemShell(oTestVm),
                                       '/sbin/rcvboxadd', 'status-kernel'));
-                iRc = self.getAdditionsInstallerResult(oTxsSession);
-                if fRc and iRc == 0:
+                if fRc and oTxsSession.isSuccess():
                     fRc = self.txsRunTest(oTxsSession, 'Check Guest Additions user services status', 5 * 60 * 1000,
                                           self.getGuestSystemShell(oTestVm),
                                           (self.getGuestSystemShell(oTestVm),
                                           '/sbin/rcvboxadd', 'status-user'));
-                    iRc = self.getAdditionsInstallerResult(oTxsSession);
-                    if fRc and iRc == 0:
+                    if fRc and oTxsSession.isSuccess():
                         pass;
                     else: