← Back to branch summary

~jibel/update-manager/AutoUpgradeTester-portlocking

« back to all changes in this revision

Viewing changes to AutoUpgradeTester/UpgradeTestBackendQemu.py

  • Committer: Michael Vogt
  • Date: 2012-01-26 08:17:13 UTC
  • mfrom: (2307.1.2 update-manager)
  • Revision ID: michael.vogt@ubuntu.com-20120126081713-m3cy700sg3l0ytzq
merged lp:~jibel/update-manager/AutoUpgradeTester-desktoptests

Show diffs side-by-side

added added

removed removed

Lines of Context:
AutoUpgradeTester/UpgradeTestBackendQemu.py
305
305
                return False
306
306
            pkgs = pkgs[CMAX+1:]
307
307
 
 
308
        # Copy additional data to the image that can the be used by the
 
309
        # post bootstrap script
 
310
        # Data is copied to /upgrade-tester/data
 
311
        # Value is a list of files separated by commas
 
312
        datadir = '/upgrade-tester/data'
 
313
        self._runInImage(["mkdir", "-p", datadir])
 
314
        if self.config.has_option("NonInteractive", "PostBootstrapData"):
 
315
            data = self.config.get("NonInteractive", "PostBootstrapData")
 
316
            for datafile in data.split(','):
 
317
                self._copyToImage(datafile, datadir)
 
318
 
308
319
        if self.config.has_option("NonInteractive","PostBootstrapScript"):
309
320
            script = self.config.get("NonInteractive","PostBootstrapScript")
310
321
            print "have PostBootstrapScript: %s" % script
311
322
            if os.path.exists(script):
312
 
                self._runInImage(["mkdir","/upgrade-tester"])
313
323
                self._copyToImage(script, "/upgrade-tester")
314
324
                self._copyToImage(glob.glob(os.path.dirname(
315
325
                            self.profile)+"/*.cfg"), "/upgrade-tester")
463
473
                    entry.type == "deb"):
464
474
                    print "adding %s to mirrors" % entry.uri
465
475
                    self._runInImage(["echo '%s' >> /upgrade-tester/new_mirrors.cfg" % entry.uri])
466
 
                    
 
476
 
467
477
            # upgrade *before* the regular upgrade runs 
468
478
            if self.config.getWithDefault("NonInteractive", "AddRepoUpgradeImmediately", False):
469
479
                self._runInImage(["apt-get", "update"])
477
487
        # check if we have a bzr checkout dir to run against or
478
488
        # if we should just run the normal upgrader
479
489
        cmd_prefix=[]
 
490
        debconf_log = self.config.getWithDefault(
 
491
            'NonInteractive', 'DebconfLog', '')
 
492
        if debconf_log:
 
493
            cmd_prefix=['export DEBIAN_FRONTEND=editor EDITOR="cat>>%s";' % debconf_log]
 
494
            print "Logging debconf prompts to %s" % debconf_log
480
495
        if not self.config.getWithDefault("NonInteractive","ForceOverwrite", False):
481
496
            print "Disabling ForceOverwrite"
482
 
            cmd_prefix = ["export RELEASE_UPGRADE_NO_FORCE_OVERWRITE=1;"]
 
497
            cmd_prefix += ["export RELEASE_UPGRADE_NO_FORCE_OVERWRITE=1;"]
483
498
        if (os.path.exists(self.upgradefilesdir) and
484
 
            self.config.getWithDefault("NonInteractive", 
485
 
                                       "UseUpgraderFromBzr", 
 
499
            self.config.getWithDefault("NonInteractive",
 
500
                                       "UseUpgraderFromBzr",
486
501
                                       True)):
487
502
            print "Using ./DistUpgrade/* for the upgrade"
488
503
            self._copyUpgraderFilesFromBzrCheckout()