diff options
| -rw-r--r-- | README.rrs | 2 | ||||
| -rw-r--r-- | rrs/admin.py | 1 | ||||
| -rw-r--r-- | rrs/migrations/0008_upgrade_info.py | 24 | ||||
| -rw-r--r-- | rrs/models.py | 2 | ||||
| -rwxr-xr-x | rrs/tools/rrs_upgrade_history.py | 51 |
5 files changed, 54 insertions, 26 deletions
diff --git a/README.rrs b/README.rrs index 65ab017959..a0453f13b6 100644 --- a/README.rrs +++ b/README.rrs @@ -34,7 +34,7 @@ $ ./scripts/tools/import_layer.py -s meta git://git.openembedded.org/openembedd $ ./layerindex/update.py $ ./rrs/tools/rrs_maintainer_history.py -d -$ ./rrs/tools/rrs_upgrade_history.py -d --initial +$ ./rrs/tools/rrs_upgrade_history.py -d $ ./rrs/tools/rrs_upstream_history.py -d $ ./rrs/tools/rrs_distros.py -d diff --git a/rrs/admin.py b/rrs/admin.py index 3f4178f3d5..fbebc65677 100644 --- a/rrs/admin.py +++ b/rrs/admin.py @@ -13,6 +13,7 @@ from rrs.models import Release, Milestone, Maintainer, RecipeMaintainerHistory, class MaintenancePlanLayerBranchInline(admin.StackedInline): model = MaintenancePlanLayerBranch + readonly_fields = ['upgrade_date', 'upgrade_rev'] min_num = 1 extra = 0 diff --git a/rrs/migrations/0008_upgrade_info.py b/rrs/migrations/0008_upgrade_info.py new file mode 100644 index 0000000000..cbacfc3eb6 --- /dev/null +++ b/rrs/migrations/0008_upgrade_info.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rrs', '0007_python23'), + ] + + operations = [ + migrations.AddField( + model_name='maintenanceplanlayerbranch', + name='upgrade_date', + field=models.DateTimeField(verbose_name='Recipe upgrade date', blank=True, null=True), + ), + migrations.AddField( + model_name='maintenanceplanlayerbranch', + name='upgrade_rev', + field=models.CharField(verbose_name='Recipe upgrade revision ', max_length=80, blank=True), + ), + ] diff --git a/rrs/models.py b/rrs/models.py index e466da0737..2833a23078 100644 --- a/rrs/models.py +++ b/rrs/models.py @@ -39,6 +39,8 @@ class MaintenancePlanLayerBranch(models.Model): python3_switch_date = models.DateTimeField('Commit date to switch to Python 3', default=datetime(2016, 6, 2)) python2_environment = models.ForeignKey(PythonEnvironment, related_name='maintplan_layerbranch_python2_set', blank=True, null=True, help_text='Environment to use for Python 2 commits') python3_environment = models.ForeignKey(PythonEnvironment, related_name='maintplan_layerbranch_python3_set', blank=True, null=True, help_text='Environment to use for Python 3 commits') + upgrade_date = models.DateTimeField('Recipe upgrade date', blank=True, null=True) + upgrade_rev = models.CharField('Recipe upgrade revision ', max_length=80, blank=True) class Meta: verbose_name_plural = "Maintenance plan layer branches" diff --git a/rrs/tools/rrs_upgrade_history.py b/rrs/tools/rrs_upgrade_history.py index f60e678253..2dbb07ba23 100755 --- a/rrs/tools/rrs_upgrade_history.py +++ b/rrs/tools/rrs_upgrade_history.py @@ -87,16 +87,6 @@ def run_internal(maintplanlayerbranch, commit, commitdate, options, logger, bitb def upgrade_history(options, logger): from rrs.models import MaintenancePlan, RecipeUpgrade - # start date - now = datetime.today() - today = now.strftime("%Y-%m-%d") - if options.initial: - # starting date of the yocto project 1.6 release - since = "2013-11-11" - else: - # FIXME this is awful - we should be storing the last commit somewhere - since = (now - timedelta(days=8)).strftime("%Y-%m-%d") - maintplans = MaintenancePlan.objects.filter(updates_enabled=True) if not maintplans.exists(): logger.error('No enabled maintenance plans found') @@ -104,16 +94,25 @@ def upgrade_history(options, logger): for maintplan in maintplans: for maintplanbranch in maintplan.maintenanceplanlayerbranch_set.all(): layerbranch = maintplanbranch.layerbranch - if options.initial and options.fullreload and not options.dry_run: + if options.fullreload and not options.dry_run: RecipeUpgrade.objects.filter(recipe__layerbranch=layerbranch).delete() layer = layerbranch.layer urldir = layer.get_fetch_dir() repodir = os.path.join(fetchdir, urldir) layerdir = os.path.join(repodir, layerbranch.vcs_subdir) - commits = utils.runcmd("git log --since='" + since + - "' --format='%H %ct' --reverse origin/master", repodir, - logger=logger) + if maintplanbranch.upgrade_rev and not options.fullreload: + initial = False + since = maintplanbranch.upgrade_date + since_option = '%s..origin/master' % maintplanbranch.upgrade_rev + else: + initial = True + since = options.since + since_option = '--since="%s" origin/master' % since + + commits = utils.runcmd("git log %s --format='%%H %%ct' --reverse" % since_option, + repodir, + logger=logger) commit_list = commits.split('\n') bitbake_map = {} @@ -125,30 +124,36 @@ def upgrade_history(options, logger): for commit in bitbake_commit_list: bitbake_map[commit] = '39780b1ccbd76579db0fc6fb9369c848a3bafa9d' - if options.initial: + if initial: logger.debug("Adding initial upgrade history ....") ct, ctepoch = commit_list.pop(0).split() ctdate = datetime.fromtimestamp(int(ctepoch)) run_internal(maintplanbranch, ct, ctdate, options, logger, bitbake_map, initial=True) - logger.debug("Adding upgrade history from %s to %s ..." % (since, today)) + logger.debug("Adding upgrade history from %s to %s ..." % (since, datetime.today().strftime("%Y-%m-%d"))) for item in commit_list: if item: ct, ctepoch = item.split() ctdate = datetime.fromtimestamp(int(ctepoch)) logger.debug("Analysing commit %s ..." % ct) run_internal(maintplanbranch, ct, ctdate, options, logger, bitbake_map) + if not options.dry_run: + maintplanbranch.upgrade_rev = ct + maintplanbranch.upgrade_date = ctdate + maintplanbranch.save() if commit_list: utils.runcmd("git clean -dfx", repodir, logger=logger) if __name__=="__main__": parser = optparse.OptionParser(usage = """%prog [options]""") - - parser.add_option("-i", "--initial", - help = "Do initial population of upgrade histories", - action="store_true", dest="initial", default=False) + + # Starting date of the yocto project 1.6 release + DEFAULT_SINCE_DATE = '2013-11-11' + parser.add_option("-s", "--since", + help="Specify initial date for importing recipe upgrades (default '%s')" % DEFAULT_SINCE_DATE, + action="store", dest="since", default=DEFAULT_SINCE_DATE) parser.add_option("-d", "--debug", help = "Enable debug output", @@ -159,14 +164,10 @@ if __name__=="__main__": action="store_true", dest="dry_run", default=False) parser.add_option("--fullreload", - help="Reload upgrade data from scratch (requires -i/--initial)", + help="Reload upgrade data from scratch", action="store_true", dest="fullreload", default=False) options, args = parser.parse_args(sys.argv) logger.setLevel(options.loglevel) - if options.fullreload and not options.initial: - logger.error('--fullreload requires -i/--initial') - sys.exit(1) - upgrade_history(options, logger) |