Capomastro

Merge lp://staging/~roadmr/capomastro/project-scheduling-ui-fixing into lp://staging/capomastro

project-scheduling-ui-fixing
Merge into trunk

Proposed by Daniel Manrique on 2015-04-15

Status:	Merged
Approved by:	Caio Begotti on 2015-05-06
Approved revision:	191
Merged at revision:	193
Proposed branch:	lp://staging/~roadmr/capomastro/project-scheduling-ui-fixing
Merge into:	lp://staging/capomastro
Diff against target:	531 lines (+345/-17) 9 files modified projects/forms.py (+6/-0) projects/helpers.py (+33/-2) projects/templates/projects/periodictask_confirm_delete.html (+26/-0) projects/templates/projects/project_detail.html (+26/-1) projects/templates/projects/projectbuild_form.html (+1/-1) projects/tests/test_helpers.py (+74/-1) projects/tests/test_views.py (+110/-2) projects/urls.py (+1/-0) projects/views.py (+68/-10)
To merge this branch:	bzr merge lp://staging/~roadmr/capomastro/project-scheduling-ui-fixing
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Caio Begotti (community)		2015-04-15	Approve on 2015-04-17
Review via email: mp+256405@code.staging.launchpad.net

Commit message

User interface changes to create schedules to build projects periodically.

This just creates the required entries in the PeriodicTasks table for djcelery use, the actual running of said tasks will come in a subsequent merge.

Description of the change

The UI portion of the build scheduling feature.

I don't precreate nor provide a way of creating the 'intervals' at which the build can be scheduled: we can do that easily via the admin and the UI won't die if there are no intervals (it just won't allow scheduling builds).

The project build request form was repurposed to also allow scheduling, the button in the main project view reflects this. In the request form itself, one can select "Now" for an immediate build (old behavior) or choose one of the provided intervals. Clicking "build" will either fire up or schedule the build. If scheduled, the user is returned to the project detail view with a message.

The detail view will show any build schedules for the shown project, including the build interval and last-built time (which is important because the times are not aligned: e.g. if I select "every 24 hours" it will build 24 hours *after* I created the schedule, not at 00:00 hours). Also, a "delete" control with a confirmation screen is present in the detail view.

I don't provide a facility for editing schedules: they're quite trivial and it's easier to just remove them if unneeded and create new ones.

Any more complex editing of intervals or schedules can be done via the admin.

Also, note that this doesn't yet launch the builds, it just creates the records in the djcelery PeriodicTask table. The actual launching will come in another MR.

Finally, I didn't have time to write the tests for the deletion workflow :( I'll do so ASAP.

Revision history for this message

Caio Begotti (caio1982) wrote on 2015-04-16:

Besides my comments inline I am deploying it from Wendigo to give it a try :-D

Revision history for this message

Caio Begotti (caio1982) wrote on 2015-04-16:

Oh! I created an interval and successfully set it up with with a Barajas build, but then I created another interval and tried to schedule a build again using the new interval and got this https://pastebin.canonical.com/129718/

duplicate key value violates unique constraint "djcelery_periodictask_name_key"
DETAIL: Key (name)=(Build Barajas) already exists.

So now I am running an immediate build now so it is cached for the schedule runs later.

Revision history for this message

Daniel Manrique (roadmr) wrote on 2015-04-16:

Replied to inline comments.

About the unique constraint: damn! I was including the build interval in the task names, so I hadn't seen this problem except when you scheduled the same project with the same interval twice (an unlikely scenario). But last-minute, I changed the task names to remove the build interval (since the task's repr shows that by default and it looked like ("Build project X every 24 minutes: every 24 minutes"). So now the unique constraint restriction is an issue again :) Give me a sec, I'll fix it.

Revision history for this message

Caio Begotti (caio1982) wrote on 2015-04-16:

Download full text (20.8 KiB)

Btw, thanks for even considering these! They were not really problems
but just string doubts/suggestions in the UI, you did a huge work
already.

On Thu, Apr 16, 2015 at 11:38 AM, Daniel Manrique
<email address hidden> wrote:
> Replied to inline comments.
>
> About the unique constraint: damn! I was including the build interval in the task names, so I hadn't seen this problem except when you scheduled the same project with the same interval twice (an unlikely scenario). But last-minute, I changed the task names to remove the build interval (since the task's repr shows that by default and it looked like ("Build project X every 24 minutes: every 24 minutes"). So now the unique constraint restriction is an issue again :) Give me a sec, I'll fix it.
>
> Diff comments:
>
>> === modified file 'projects/forms.py'
>> --- projects/forms.py 2015-01-23 21:18:51 +0000
>> +++ projects/forms.py 2015-04-15 22:26:00 +0000
>> @@ -1,5 +1,6 @@
>> from django import forms
>>
>> +from djcelery.models import IntervalSchedule
>> from jenkins.models import JenkinsServer, JobType
>> from projects.models import (
>> Project, Dependency, ProjectDependency)
>> @@ -77,3 +78,8 @@
>> error_messages={"required": "Must select at least one dependency."})
>> project = forms.ModelChoiceField(
>> Project.objects, required=True, widget=forms.HiddenInput)
>> + interval = forms.ModelChoiceField(label='When to build',
>> + widget=forms.RadioSelect(),
>> + queryset=IntervalSchedule.objects.all(),
>> + empty_label="Now",
>> + required=False)
>>
>> === modified file 'projects/helpers.py'
>> --- projects/helpers.py 2014-08-05 14:10:55 +0000
>> +++ projects/helpers.py 2015-04-15 22:26:00 +0000
>> @@ -1,7 +1,9 @@
>> +import json
>> +
>> from jenkins.tasks import build_job
>> from jenkins.models import Build
>> -from projects.models import ProjectDependency
>> -
>> +from projects.models import Project, ProjectDependency
>> +from djcelery.models import PeriodicTask
>>
>> def build_dependency(dependency, build_id=None, user=None):
>> """
>> @@ -96,3 +98,32 @@
>> return previous_build.build_dependencies.filter(
>> projectdependency=dependency).first()
>> return dependency.current_build
>> +
>> +
>> +def periodic_tasks_for_project(project):
>> + """
>> + Return a list of PeriodicTask records that are scheduled to build
>> + the given project.
>> + """
>> + expected_args = [project.pk]
>> + return [ptask for ptask in PeriodicTask.objects.filter(
>> + task="projects.tasks.start_periodic_build",
>> + args=expected_args)]
>> +
>> +
>> +def project_for_periodic_task(task):
>> + """
>> + Return the project that a given periodic_task will build, but only
>> + if the task is the start_periodic_build one. If it's not, then we
>> + can't be sure of the meaning of the parameter list so we return None.
>> + """
>> + # Tricky because what we have in the task is a json-encoded array
>> + if task.task != "projects....

Btw, thanks for even considering these! They were not really problems
but just string doubts/suggestions in the UI, you did a huge work
already.

On Thu, Apr 16, 2015 at 11:38 AM, Daniel Manrique
<daniel.manrique@canonical.com> wrote:
> Replied to inline comments.
>
> About the unique constraint: damn! I was including the build interval in the task names, so I hadn't seen this problem except when you scheduled the same project with the same interval twice (an unlikely scenario). But last-minute, I changed the task names to remove the build interval (since the task's repr shows that by default and it looked like ("Build project X every 24 minutes: every 24 minutes"). So now the unique constraint restriction is an issue again :) Give me a sec, I'll fix it.
>
> Diff comments:
>
>> === modified file 'projects/forms.py'
>> --- projects/forms.py 2015-01-23 21:18:51 +0000
>> +++ projects/forms.py 2015-04-15 22:26:00 +0000
>> @@ -1,5 +1,6 @@
>>  from django import forms
>>
>> +from djcelery.models import IntervalSchedule
>>  from jenkins.models import JenkinsServer, JobType
>>  from projects.models import (
>>      Project, Dependency, ProjectDependency)
>> @@ -77,3 +78,8 @@
>>          error_messages={"required": "Must select at least one dependency."})
>>      project = forms.ModelChoiceField(
>>          Project.objects, required=True, widget=forms.HiddenInput)
>> +    interval = forms.ModelChoiceField(label='When to build',
>> +                                      widget=forms.RadioSelect(),
>> +                                      queryset=IntervalSchedule.objects.all(),
>> +                                      empty_label="Now",
>> +                                      required=False)
>>
>> === modified file 'projects/helpers.py'
>> --- projects/helpers.py       2014-08-05 14:10:55 +0000
>> +++ projects/helpers.py       2015-04-15 22:26:00 +0000
>> @@ -1,7 +1,9 @@
>> +import json
>> +
>>  from jenkins.tasks import build_job
>>  from jenkins.models import Build
>> -from projects.models import ProjectDependency
>> -
>> +from projects.models import Project, ProjectDependency
>> +from djcelery.models import PeriodicTask
>>
>>  def build_dependency(dependency, build_id=None, user=None):
>>      """
>> @@ -96,3 +98,32 @@
>>              return previous_build.build_dependencies.filter(
>>                  projectdependency=dependency).first()
>>      return dependency.current_build
>> +
>> +
>> +def periodic_tasks_for_project(project):
>> +    """
>> +    Return a list of PeriodicTask records that are scheduled to build
>> +    the given project.
>> +    """
>> +    expected_args = [project.pk]
>> +    return [ptask for ptask in PeriodicTask.objects.filter(
>> +        task="projects.tasks.start_periodic_build",
>> +        args=expected_args)]
>> +
>> +
>> +def project_for_periodic_task(task):
>> +    """
>> +    Return the project that a given periodic_task will build, but only
>> +    if the task is the start_periodic_build one. If it's not, then we
>> +    can't be sure of the meaning of the parameter list so we return None.
>> +    """
>> +    # Tricky because what we have in the task is a json-encoded array
>> +    if task.task != "projects.tasks.start_periodic_build":
>> +        return None
>> +    args_array = json.loads(task.args)
>> +    if len(args_array) != 1:
>> +        return None
>> +    projects = Project.objects.filter(pk=int(args_array.pop()))
>> +    if len(projects) != 1:
>> +        return None
>> +    return projects[0]
>>
>> === added file 'projects/templates/projects/periodictask_confirm_delete.html'
>> --- projects/templates/projects/periodictask_confirm_delete.html      1970-01-01 00:00:00 +0000
>> +++ projects/templates/projects/periodictask_confirm_delete.html      2015-04-15 22:26:00 +0000
>> @@ -0,0 +1,26 @@
>> +{% extends "base.html" %}
>> +{% load bootstrap3 %}
>> +{% load capomastro_bootstrap %}
>> +{% load jenkins_tags %}
>> +{% load projects_tags %}
>> +
>> +{% block page_title %}Delete Build Schedule {{ object }}{% endblock %}
>> +{% block page_class %}dependency{% endblock %}
>> +
>> +{% block content %}
>> +<div class="container">
>> +  <div class="row">
>> +      <h3>Delete schedule for {{object}}</h3>
>> +    {% if projects.count < 1%}
>> +      <form action="" method="post" class="form" id="confirm">
>> +        <p class="bg-danger">This will delete this scheduled build.</p>
>
> Sounds OK to me. I changed it, I had to be a bit more verbose because the "abort" action is called "Cancel". Let me know if you like what I did.
>
>> +        {% csrf_token %}
>> +        {% buttons %}
>> +          <button type="submit" class="btn">Confirm delete »</button>
>> +          <a href="{% url 'project_detail' pk=project.pk %}" class="btn btn-primary" role="button">Cancel »</a>
>> +        {% endbuttons %}
>> +      </form>
>> +    {% endif %}
>> +  </div>
>> +</div>
>> +{% endblock %}
>>
>> === modified file 'projects/templates/projects/project_detail.html'
>> --- projects/templates/projects/project_detail.html   2015-03-25 22:57:05 +0000
>> +++ projects/templates/projects/project_detail.html   2015-04-15 22:26:00 +0000
>> @@ -38,7 +38,7 @@
>>      <p>
>>        <p>
>>        <a href="{% url 'project_initiate_projectbuild' pk=project.pk %}"
>> -          class="btn {% if dependencies %}btn-primary"{% else %}btn-default"  disabled="disabled"{% endif %} role="button">Build project »</a>
>> +          class="btn {% if dependencies %}btn-primary"{% else %}btn-default"  disabled="disabled"{% endif %} role="button">Build or schedule project »</a>
>>        <a href="{% url 'project_update' pk=project.pk %}" class="btn" role="button">Edit project »</a>
>>      </p>
>>    </div>
>> @@ -71,6 +71,31 @@
>>        </tbody>
>>      </table>
>>    </div>
>> +  {% if periodic_tasks %}
>> +  <div class="row">
>> +      <h3>Build Schedule</h3>
>> +      <table class="table table-striped">
>> +          <thead>
>> +            <tr>
>> +              <th>Schedule</th>
>> +              <th>Interval</th>
>> +              <th>Last run</th>
>> +              <th>Delete</th>
>> +            </tr>
>> +          </thead>
>> +          {% for task in periodic_tasks %}
>> +          <tr>
>> +            <td>{{ task.name }}</td>
>> +            <td>{{ task.interval }}</td>
>> +            <td>{{ task.last_run_at|default:"(Not run yet)" }}</td>
>> +            <td>
>> +                <a title="Delete {{task.name}}" href="{% url 'project_periodic_task_delete' pk=task.pk %}" class="btn btn-primary"><span class="glyphicon glyphicon-remove"></span></a>
>
> Done.
>
>> +            </td>
>> +          </tr>
>> +          {% endfor %}
>> +      </table>
>> +  </div>
>> +  {% endif %}
>>    <div class="row">
>>      <h3>Recent builds</h3>
>>      <table class="table table-striped">
>>
>> === modified file 'projects/templates/projects/projectbuild_form.html'
>> --- projects/templates/projects/projectbuild_form.html        2015-03-26 17:37:54 +0000
>> +++ projects/templates/projects/projectbuild_form.html        2015-04-15 22:26:00 +0000
>> @@ -1,14 +1,14 @@
>>  {% extends "base.html" %}
>>  {% load bootstrap3 %}
>>
>> -{% block page_title %}Capomastro - Build Project{% endblock %}
>> +{% block page_title %}Capomastro - Build or Schedule Project{% endblock %}
>
> I'll change this one, but I'd prefer to keep the one in the "build" button, as otherwise people may wonder "but how do create scheduled builds?"
>
>>  {% block page_class %}projects{% endblock %}
>>
>>  {% block content %}
>>  <div class="container">
>>    <div class="row">
>>      <div>
>> -      <h2>Build Project {{ project.name }}</h2>
>> +      <h2>Build or Schedule Project {{ project.name }}</h2>
>>        <h3>{{ project.name }}</h3>
>>        <p>{{ project.description|default:"" }}</p>
>>        {% if dependency_count > 0 %}
>>
>> === modified file 'projects/tests/test_helpers.py'
>> --- projects/tests/test_helpers.py    2014-08-05 14:10:55 +0000
>> +++ projects/tests/test_helpers.py    2015-04-15 22:26:00 +0000
>> @@ -1,15 +1,88 @@
>> +import json
>> +
>>  from django.test import TestCase
>>  from django.contrib.auth.models import User
>>  import mock
>>
>> +from djcelery.models import PERIOD_CHOICES, IntervalSchedule, PeriodicTask
>>  from projects.models import (
>>      ProjectBuild, ProjectDependency, ProjectBuildDependency)
>>  from projects.helpers import (
>> -    build_project, build_dependency)
>> +    build_project, build_dependency, project_for_periodic_task)
>>  from .factories import ProjectFactory, DependencyFactory
>>  from jenkins.tests.factories import BuildFactory
>>
>>
>> +class PeriodicTaskTest(TestCase):
>> +
>> +    def setUp(self):
>> +        # First send a build schedule request for the project.
>> +        my_interval = IntervalSchedule(every=15, period=PERIOD_CHOICES[2][0])
>> +        my_interval.save()
>> +        [dep1, dep2, dep3] = DependencyFactory.create_batch(3)
>> +        project = ProjectFactory.create()
>> +        for dep in [dep1, dep2, dep3]:
>> +            ProjectDependency.objects.create(
>> +                project=project, dependency=dep)
>> +        task_args = [project.pk]
>> +        task_args_json = json.dumps(task_args)
>> +        st = PeriodicTask(
>> +            interval=my_interval,
>> +            name="Build {}".format(project, my_interval),
>> +            task='projects.tasks.start_periodic_build',
>> +            enabled=True,
>> +            args=task_args_json)
>> +        st.save()
>> +
>> +        stu = PeriodicTask(interval=my_interval,
>> +                           name="Unlinked",
>> +                           task='projects.tasks.start_periodic_build',
>> +                           enabled=True, args=json.dumps([0]))
>> +        stu.save()
>> +
>> +        self.interval = my_interval
>> +        self.project = project
>> +        self.dependencies = [dep1, dep2, dep3]
>> +        self.periodic_task = st
>> +        self.unlinked_periodic_task = stu
>> +
>> +    def test_project_for_existing_periodic_task(self):
>> +        """
>> +        Helper should return the expected project for a task
>> +        """
>> +        self.assertEqual(self.project,
>> +                         project_for_periodic_task(self.periodic_task))
>> +
>> +    def test_project_for_periodic_task_bad_task_method(self):
>> +        """
>> +        If the task is not start_periodic_build (i.e. it's an unknown
>> +        task), it should return None
>> +        """
>> +        self.periodic_task.task = "some.bogus.task"
>> +        self.periodic_task.save()
>> +        self.assertEqual(None,
>> +                         project_for_periodic_task(self.periodic_task))
>> +
>> +    def test_project_for_unlinked_periodic_task(self):
>> +        """
>> +        If the task is not linked to a project, it should return None
>> +        """
>> +        self.assertEqual(
>> +            None,
>> +            project_for_periodic_task(self.unlinked_periodic_task))
>> +
>> +    def test_project_for_mutant_periodic_task(self):
>> +        """
>> +        If the task's argument list is bogus, it should return None
>> +        """
>> +        # Borking a task's parameter list
>> +        self.unlinked_periodic_task.args = json.dumps([20, 30, 40])
>> +        self.unlinked_periodic_task.save()
>> +        self.assertEqual(
>> +            None,
>> +            project_for_periodic_task(self.unlinked_periodic_task))
>> +
>> +
>>  class BuildProjectTest(TestCase):
>>
>>      def test_build_project(self):
>>
>> === modified file 'projects/tests/test_views.py'
>> --- projects/tests/test_views.py      2015-03-27 14:36:22 +0000
>> +++ projects/tests/test_views.py      2015-04-15 22:26:00 +0000
>> @@ -3,6 +3,7 @@
>>
>>  from django_webtest import WebTest
>>  import mock
>> +from djcelery.models import PERIOD_CHOICES, IntervalSchedule, PeriodicTask
>>
>>  from jenkins.models import Job, Build
>>  from jenkins.tests.factories import (
>> @@ -71,6 +72,42 @@
>>              sorted(projectbuilds[1:], key=lambda x: x.build_id, reverse=True),
>>              list(response.context["projectbuilds"]))
>>
>> +    def test_project_detail_with_schedule(self):
>> +        """
>> +        If a schedule for builds for this project exists, it should be shown in
>> +        the view.
>> +        """
>> +        # First send a build schedule request for the project.
>> +        my_interval = IntervalSchedule(every=15, period=PERIOD_CHOICES[2][0])
>> +        my_interval.save()
>> +
>> +        [dep1, dep2, dep3] = DependencyFactory.create_batch(3)
>> +        project = ProjectFactory.create()
>> +        for dep in [dep1, dep2, dep3]:
>> +            ProjectDependency.objects.create(
>> +                project=project, dependency=dep)
>> +        url = reverse(
>> +            "project_initiate_projectbuild", kwargs={"pk": project.pk})
>> +        response = self.app.get(url, user=self.user)
>> +        form = response.forms["buildproject-form"]
>> +
>> +        form["dependencies"] = [str(dep1.pk), str(dep2.pk), str(dep3.pk)]
>> +        form["interval"] = str(my_interval.pk)
>> +        response = form.submit().follow()
>> +
>> +        # Now check that the project detail page shows the periodic build
>> +
>> +        project_url = reverse("project_detail", kwargs={"pk": project.pk})
>> +        response = self.app.get(project_url, user=self.user)
>> +        self.assertEqual(200, response.status_code)
>> +        # The context should contain a list with one periodic task, since
>> +        # the table was clean to start with, it should be the first
>> +        # PeriodicTask we have
>> +        self.assertEqual([PeriodicTask.objects.all()[0]],
>> +                         response.context["periodic_tasks"])
>> +        # But is it rendered?
>> +        self.assertTrue("every 15 minutes" in response.content)
>> +
>>      def test_project_detail_artifacts(self):
>>          """
>>          The project detail should return artifacts with the URL from Jenkins or
>> @@ -829,6 +866,37 @@
>>          self.assertContains(response, "Must select at least one dependency.")
>>          self.assertEqual([], build_job_mock.delay.mock_calls)
>>
>> +    def test_project_build_form_with_interval(self):
>> +        """
>> +        If an interval is given, check that build_job wasn't called and that an
>> +        entry in PeriodicTask was created
>> +        """
>> +
>> +        my_interval = IntervalSchedule(every=15, period=PERIOD_CHOICES[2][0])
>> +        my_interval.save()
>> +
>> +        [dep1, dep2, dep3] = DependencyFactory.create_batch(3)
>> +        project = ProjectFactory.create()
>> +        for dep in [dep1, dep2, dep3]:
>> +            ProjectDependency.objects.create(
>> +                project=project, dependency=dep)
>> +        url = reverse(
>> +            "project_initiate_projectbuild", kwargs={"pk": project.pk})
>> +        response = self.app.get(url, user=self.user)
>> +        form = response.forms["buildproject-form"]
>> +
>> +        form["dependencies"] = [str(dep1.pk), str(dep2.pk), str(dep3.pk)]
>> +        form["interval"] = str(my_interval.pk)
>> +
>> +        with mock.patch("projects.helpers.build_job") as build_job_mock:
>> +            response = form.submit().follow()
>> +
>> +        self.assertQuerysetEqual(
>> +            PeriodicTask.objects.all(),
>> +            [('<PeriodicTask: Build {}:'
>> +              ' every 15 minutes>').format(project)])
>> +
>> +        self.assertFalse(build_job_mock.delay.called)
>>
>>  class ProjectUpdateTest(WebTest):
>>
>>
>> === modified file 'projects/urls.py'
>> --- projects/urls.py  2014-05-23 13:49:04 +0000
>> +++ projects/urls.py  2015-04-15 22:26:00 +0000
>> @@ -17,4 +17,5 @@
>>      url(r"^dependencies/(?P<pk>\d+)/$", DependencyDetailView.as_view(), name="dependency_detail"),
>>      url(r"^dependencies/(?P<pk>\d+)/edit/$", DependencyUpdateView.as_view(), name="dependency_update"),
>>      url(r"^dependencies/(?P<pk>\d+)/delete/$", DependencyDeleteView.as_view(), name="dependency_delete"),
>> +    url(r"^projects/periodic_task_delete/(?P<pk>\d+)$", PeriodicTaskDeleteView.as_view(), name="project_periodic_task_delete"),
>>  )
>>
>> === modified file 'projects/views.py'
>> --- projects/views.py 2015-03-26 17:37:54 +0000
>> +++ projects/views.py 2015-04-15 22:26:00 +0000
>> @@ -1,3 +1,5 @@
>> +import json
>> +
>>  from django.core.paginator import (
>>      Paginator, EmptyPage, PageNotAnInteger)
>>  from django.shortcuts import get_object_or_404
>> @@ -6,6 +8,7 @@
>>  from django.contrib import messages
>>  from django.core.urlresolvers import reverse
>>  from django.http import HttpResponseRedirect
>> +from djcelery.models import PeriodicTask
>>
>>  from braces.views import (
>>      LoginRequiredMixin, PermissionRequiredMixin, FormValidMessageMixin)
>> @@ -19,7 +22,9 @@
>>      ProjectBuildDependency)
>>  from projects.forms import (
>>      ProjectForm, DependencyCreateForm, ProjectBuildForm)
>> -from projects.helpers import build_project, build_dependency
>> +from projects.helpers import (
>> +    build_project, build_dependency, periodic_tasks_for_project,
>> +    project_for_periodic_task)
>>  from projects.utils import get_build_table_for_project
>>  from archives.helpers import get_default_archive
>>
>> @@ -118,15 +123,33 @@
>>
>>      def form_valid(self, form):
>>          project = form.cleaned_data["project"]
>> -        projectbuild = build_project(
>> -            project, user=self.request.user,
>> -            dependencies=form.cleaned_data["dependencies"])
>> -        messages.add_message(
>> -            self.request, messages.INFO,
>> -            "Build '%s' queued." % projectbuild.build_id)
>> -
>> -        url_args = {"project_pk": project.pk, "build_pk": projectbuild.pk}
>> -        url = reverse("project_projectbuild_detail", kwargs=url_args)
>> +        dependencies = form.cleaned_data["dependencies"]
>> +        interval = form.cleaned_data["interval"]
>> +        if interval:
>> +            task_args = [project.pk]
>> +            task_kwargs = {'user': self.request.user.pk,
>> +                           'dependencies': [d.pk for d in dependencies]}
>> +            task_kwargs_json = json.dumps(task_kwargs)
>> +            task_args_json = json.dumps(task_args)
>> +            st = PeriodicTask()
>> +            st.interval = interval
>> +            st.name = "Build {}".format(project, st.interval)
>> +            st.task = 'projects.tasks.start_periodic_build'
>> +            st.enabled = True
>> +            st.args = task_args_json
>> +            st.kwargs = task_kwargs_json
>> +            st.save()
>> +            message = "%s scheduled." % st.name
>> +            url_args = {"pk": project.pk}
>> +            url = reverse("project_detail", kwargs=url_args)
>> +        else:
>> +            projectbuild = build_project(
>> +                project, user=self.request.user,
>> +                dependencies=dependencies)
>> +            message = "Build '%s' queued." % projectbuild.build_id
>> +            url_args = {"project_pk": project.pk, "build_pk": projectbuild.pk}
>> +            url = reverse("project_projectbuild_detail", kwargs=url_args)
>> +        messages.add_message(self.request, messages.INFO, message)
>>          return HttpResponseRedirect(url)
>>
>>
>> @@ -228,6 +251,9 @@
>>          archive = get_default_archive()
>>          if archive:
>>              context["archiver"] = archive
>> +        periodic_tasks = periodic_tasks_for_project(context["project"])
>> +        if periodic_tasks:
>> +            context["periodic_tasks"] = periodic_tasks
>>
>>          return context
>>
>> @@ -446,10 +472,33 @@
>>          return context
>>
>>
>> +class PeriodicTaskDeleteView(LoginRequiredMixin,
>> +                             PermissionRequiredMixin,
>> +                             DeleteView):
>> +
>> +    permission_required = "djcelery.delete_periodic_task"
>> +    model = PeriodicTask
>> +    template_name = "projects/periodictask_confirm_delete.html"
>> +
>> +    def get_success_url(self):
>> +        context = self.get_context_data()
>> +        return reverse("project_detail", kwargs={'pk': context['project'].pk})
>> +
>> +    def get_context_data(self, **kwargs):
>> +        """
>> +        Add the project to context data (used mainly to build the
>> +        success/cancel URLs)
>> +        """
>> +        context = super(
>> +            PeriodicTaskDeleteView, self).get_context_data(**kwargs)
>> +        periodic_task = context['object']
>> +        context["project"] = project_for_periodic_task(periodic_task)
>> +        return context
>> +
>>  __all__ = [
>>      "ProjectCreateView", "ProjectListView", "ProjectDetailView",
>>      "DependencyCreateView", "InitiateProjectBuildView", "ProjectBuildListView",
>>      "ProjectBuildDetailView", "DependencyListView", "DependencyDetailView",
>>      "ProjectUpdateView", "ProjectDependenciesView", "DependencyUpdateView",
>> -    "DependencyDeleteView"
>> +    "DependencyDeleteView", "PeriodicTaskDeleteView"
>>  ]
>>
>
>
> --
> https://code.launchpad.net/~roadmr/capomastro/project-scheduling-ui-fixing/+merge/256405
> Your team CE Infrastructure is requested to review the proposed merge of lp:~roadmr/capomastro/project-scheduling-ui-fixing into lp:capomastro.

Revision history for this message

Daniel Manrique (roadmr) wrote on 2015-04-16:

I pushed a fix for the unique name constraint. It'll tack on a serial number to the task name, but only if needed. So if someone adds two periodictasks for the same project (weird, but it can happen) it will work now.

Ready for another check!

lp://staging/~roadmr/capomastro/project-scheduling-ui-fixing updated on 2015-04-16

189. By Daniel Manrique on 2015-04-16

projects: Allow deletion of build schedules.

This is just the DeleteView, new URL endpoint. It could be called
directly but has yet to be wired to the project detail view.

190. By Daniel Manrique on 2015-04-16

projects: UI to add, view and delete scheduled builds.

I also call them "build schedules" because it's a schedule under which
builds will be produced.

The UI allows:
- A user can select either "Now" for the old behavior, or one of the
available intervals if a periodic build is desired. This allows
periodic build scheduling with minimal UI changes.

- The project's detail view shows any build schedules for that project,
and allows deleting them by invoking the previously-added deleteview.

- It will only show available intervals. If no intervals have been added
via the admin pages, then the only option will be "Now", so confusion
is kept to a minimum.

191. By Daniel Manrique on 2015-04-16

projects: Create and display build schedules.

Includes tests to check:
- Scheduled builds are shown in a project's details page
- A PeriodicTask (i.e. a schedule for builds) is created when an
interval is selected, rather than launching a build immediately.

Revision history for this message

Caio Begotti (caio1982) wrote on 2015-04-17:

Tried a few different builds, canceling them, updating projects schedules and left both the old branch code running overnight and the new one with the unique name fix for some time. All builds seem good. The tests you and Chris were doing on Staging were all done using this branch!

review: Approve

Revision history for this message

Caio Begotti (caio1982) wrote on 2015-04-17:

Just for reference: I scheduled 6 overnight builds and this morning other 3 hourly ones.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Daniel Manrique

Ubuntu One hackers

Zygmunt Krynicki