Changeset 83848 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 20, 2020 10:46:25 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137377

Message:

Validation Kit/Guest Additions: Added some proxy settings for Linux guests.

File:

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

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

@@ -340 +340 @@
         fRc = False;
 
+        # Additional environment block to add to the following commands.
+        asEnv = ();
+
+        fNeedsProxy = True; ## @todo Make this more flexible / dynamic.
+        sHttpProxy  = 'http://emea-proxy.uk.oracle.com:80/';
+        sHttpsProxy = sHttpProxy;
+
+        if fNeedsProxy:
+            reporter.log('Using proxy: ' + sHttpProxy);
+            asEnv += ('http_proxy='  + sHttpProxy, 'https_proxy=' + sHttpsProxy);
+
         # Install Kernel headers, which are required for actually installing the Linux Additions.
         if oTestVm.sKind.startswith('Debian') \
         or oTestVm.sKind.startswith('Ubuntu'):
+
+            if fNeedsProxy:
+                fRc = oTxsSession.syncMkDir("/etc/apt/apt.conf.d/", 0o755);
+                if fRc:
+                    fRc = oTxsSession.syncUploadString('"Acquire::http::Proxy \"' + sHttpProxy + '\"\r\n'
+                                                       'Acquire::https::Proxy \"' + sHttpsProxy + '\"',
+                                                       '/etc/apt/apt.conf.d/proxy.conf', 0o644);
+                    if not fRc:
+                        reporter.error('Unable to write to /etc/apt/apt.conf.d/proxy.conf');
+                else:
+                    reporter.error('Unable to create /etc/apt/apt.conf.d');
 
             # As Ubuntu 15.10 is EOL we need to tweak the package sources by hand first in order to have a working
@@ -356 +378 @@
                 fRc = self.txsRunTest(oTxsSession, 'Updating package sources', 5 * 60 *1000,
                                       '/usr/bin/apt-get', ('/usr/bin/apt-get', 'update'),
+                                      asAddEnv = asEnv,
                                       fCheckSessionStatus = True);
             if fRc:
                 fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
                                       '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'linux-headers-generic'),
+                                      asAddEnv = asEnv,
                                       fCheckSessionStatus = True);
             if fRc:
                 fRc = self.txsRunTest(oTxsSession, 'Installing Guest Additions depdendencies', 5 * 60 *1000, \
                                       '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'build-essential', 'perl'),
+                                      asAddEnv = asEnv,
                                       fCheckSessionStatus = True);
         elif oTestVm.sKind.startswith('OL') \
@@ -370 +395 @@
         or   oTestVm.sKind.startswith('Redhat') \
         or   oTestVm.sKind.startswith('Cent'):
+
             fRc = self.txsRunTest(oTxsSession, 'Updating package sources', 5 * 60 *1000,
                                                '/usr/bin/yum', ('/usr/bin/yum', 'update'),
+                                               asAddEnv = asEnv,
                                                fCheckSessionStatus = True);
             if fRc:
                 fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
                                       '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', 'kernel-headers'),
+                                      asAddEnv = asEnv,
                                       fCheckSessionStatus = True);
             if fRc:
@@ -381 +409 @@
                                       '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', \
                                                    'make', 'automake', 'gcc', 'kernel-devel', 'dkms', 'bzip2', 'perl'),
+                                      asAddEnv = asEnv,
                                       fCheckSessionStatus = True);
         else: