From fe7e0ff1f4c24d9055a98798dccf0ca6ecc45268 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Mar 2013 16:19:33 +0100 Subject: [PATCH] Show inputs and input changes on the jobset eval page --- src/root/build.tt | 31 ++-------- src/root/common.tt | 34 ++++++++++- src/root/jobset-eval.tt | 128 +++++++++++++++++++++++----------------- 3 files changed, 110 insertions(+), 83 deletions(-) diff --git a/src/root/build.tt b/src/root/build.tt index 85027e20..49a41d25 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -206,9 +206,9 @@ [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %] - [% INCLUDE renderInputDiff build1=prevSuccessfulBuild build2=firstBrokenBuild %] + [% INCLUDE renderInputDiff inputs1=prevSuccessfulBuild.inputs inputs2=firstBrokenBuild.inputs %] [% END %] - [% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=build %] + [% INCLUDE renderInputDiff inputs1=prevSuccessfulBuild.inputs inputs2=build.inputs %] [% END %] @@ -311,34 +311,11 @@
- - - - - - [% FOREACH input IN build.inputs %] - - - - - - - - [% END %] - -
NameTypeValueRevisionStore path
[% input.name %][% type = input.type; inputTypes.$type %] - [% IF input.type == "build" || input.type == "sysbuild" %] - [% INCLUDE renderFullBuildLink build=input.dependency %] - [% ELSIF input.type == "string" || input.type == "boolean" %] - "[% input.value %]" - [% ELSE %] - [% input.uri %] - [% END %] - [% IF input.revision %][% input.revision %][% END %][% input.path %]
+ [% INCLUDE renderInputs inputs=build.inputs %] [% IF prevBuild %]

Changes since previous [% INCLUDE renderBuildLink build=prevBuild %]

- [% INCLUDE renderInputDiff build2=build, build1=prevBuild %] + [% INCLUDE renderInputDiff inputs2=build.inputs inputs1=prevBuild.inputs %] [% END %]
diff --git a/src/root/common.tt b/src/root/common.tt index f1b1d9cb..8a90c912 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -306,6 +306,34 @@ BLOCK renderDiffUri; END; +BLOCK renderInputs; %] + + + + + + [% FOREACH input IN inputs %] + + + + + + + + [% END %] + +
NameTypeValueRevisionStore path
[% input.name %][% type = input.type; inputTypes.$type %] + [% IF input.type == "build" || input.type == "sysbuild" %] + [% INCLUDE renderFullBuildLink build=input.dependency %] + [% ELSIF input.type == "string" || input.type == "boolean" %] + "[% input.value %]" + [% ELSE %] + [% input.uri %] + [% END %] + [% IF input.revision %][% input.revision %][% END %][% input.path %]
+[% END; + + BLOCK renderInputDiff; %] [% IF !nestedDiff %] @@ -316,9 +344,9 @@ BLOCK renderInputDiff; %] END; IF nestLevel <= 3; - FOREACH bi1 IN build1.inputs; + FOREACH bi1 IN inputs1; deletedInput = 1; - FOREACH bi2 IN build2.inputs; + FOREACH bi2 IN inputs2; IF bi1.name == bi2.name; IF bi1.type == bi2.type; IF bi1.value != bi2.value || bi1.uri != bi2.uri %] @@ -338,7 +366,7 @@ BLOCK renderInputDiff; %] [% bi1.name %] [% END %] [% ELSE %] diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt index ad65e164..23d3dd79 100644 --- a/src/root/jobset-eval.tt +++ b/src/root/jobset-eval.tt @@ -8,68 +8,90 @@ c.uri_for(c.controller('JobsetEval').action_for('view'), [otherEval.id]) %]">[% otherEval.id %].

[% END %] -[% BLOCK renderSome %] - [% size = builds.size; max = full ? size : 30; %] - [% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1) - hideProjectName=1 hideJobsetName=1 %] - [% IF size > max; params = c.req.params; params.full = 1 %] - - [% END %] -[% END %] + -[% INCLUDE renderBuildListHeader unsortable=1 %] +
-[% IF unfinished.size > 0 %] -
- [% INCLUDE renderSome builds=unfinished %] -[% END %] +
-[% IF new.size > 0 %] -
- [% INCLUDE renderSome builds=new %] -[% END %] + [% BLOCK renderSome %] + [% size = builds.size; max = full ? size : 30; %] + [% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1) + hideProjectName=1 hideJobsetName=1 %] + [% IF size > max; params = c.req.params; params.full = 1 %] + + [% END %] + [% END %] -[% IF removed.size > 0 %] - - [% size = removed.size; max = full ? size : 30; %] - [% FOREACH j IN removed.slice(0,(size > max ? max : size) - 1) %] - - - - - - [% END %] - [% IF size > max; params = c.req.params; params.full = 1 %] - - [% END %] -[% END %] + [% INCLUDE renderBuildListHeader unsortable=1 %] -[% IF nowFail.size > 0 %] - - [% INCLUDE renderSome builds=nowFail %] -[% END %] + [% IF unfinished.size > 0 %] + + [% INCLUDE renderSome builds=unfinished %] + [% END %] -[% IF nowSucceed.size > 0 %] - - [% INCLUDE renderSome builds=nowSucceed %] -[% END %] + [% IF new.size > 0 %] + + [% INCLUDE renderSome builds=new %] + [% END %] -[% IF stillFail.size > 0 %] - - [% INCLUDE renderSome builds=stillFail %] -[% END %] + [% IF removed.size > 0 %] + + [% size = removed.size; max = full ? size : 30; %] + [% FOREACH j IN removed.slice(0,(size > max ? max : size) - 1) %] + + + + + + [% END %] + [% IF size > max; params = c.req.params; params.full = 1 %] + + [% END %] + [% END %] -[% IF stillSucceed.size > 0 %] - - [% INCLUDE renderSome builds=stillSucceed %] -[% END %] + [% IF nowFail.size > 0 %] + + [% INCLUDE renderSome builds=nowFail %] + [% END %] -[% INCLUDE renderBuildListFooter %] + [% IF nowSucceed.size > 0 %] + + [% INCLUDE renderSome builds=nowSucceed %] + [% END %] -[% IF c.user_exists %] -

-Release -

-[% END %] + [% IF stillFail.size > 0 %] + + [% INCLUDE renderSome builds=stillFail %] + [% END %] + + [% IF stillSucceed.size > 0 %] + + [% INCLUDE renderSome builds=stillSucceed %] + [% END %] + + [% INCLUDE renderBuildListFooter %] + + [% IF c.user_exists %] +

+ Release +

+ [% END %] + + + +
+ [% INCLUDE renderInputs inputs=eval.jobsetevalinputs %] + + [% IF otherEval %] +

Changes

+ [% INCLUDE renderInputDiff inputs2=eval.jobsetevalinputs inputs1=otherEval.jobsetevalinputs %] + [% END %] +
+ + [% END %]
[% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %]

- [% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency, nestedDiff=1, nestLevel=nestLevel+1 %] + [% INCLUDE renderInputDiff inputs1=bi1.dependency.inputs inputs2=bi2.dependency.inputs nestedDiff=1 nestLevel=nestLevel+1 %]
([% size - max %] more builds omitted)
Queued jobs
New jobs
([% size - max %] more builds omitted)
Removed jobs
[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.job %][% j.system %]
([% size - max %] more jobs omitted)
Jobs that now fail
Queued jobs
Jobs that now succeed
New jobs
Jobs that still fail
Removed jobs
[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.job %][% j.system %]
([% size - max %] more jobs omitted)
Jobs that still succeed
Jobs that now fail
Jobs that now succeed
Jobs that still fail
Jobs that still succeed