fix(bake): Execution details Rebake was always false when force rebaking

When selecting "Force rebake" on a manual execution, the flag is set on the trigger and therefore not correctly displayed in Deck.
spinnaker · Oct 16, 2018 · 55987ec · 55987ec
1 parent 8e23f8f
commit 55987ec
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html
@@ -24,8 +24,10 @@
           <dd ng-if="!roscoMode">{{stage.context.storeType | uppercase}}</dd>
           <dt ng-if="!roscoMode">Label</dt>
           <dd ng-if="!roscoMode">{{stage.context.baseLabel}}</dd>
-          <dt ng-if="roscoMode || stage.context.rebake">Rebake</dt>
-          <dd ng-if="roscoMode || stage.context.rebake">{{stage.context.rebake || false}}</dd>
+          <dt ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">Rebake</dt>
+          <dd ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">
+            {{execution.trigger.rebake || stage.context.rebake || false}}
+          </dd>
           <dt ng-if="stage.context.templateFileName">Template</dt>
           <dd ng-if="stage.context.templateFileName">{{stage.context.templateFileName}}</dd>
           <dt ng-if="stage.context.varFileName">Var File</dt>

diff --git a/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/azure/pipeline/stages/bake/bakeExecutionDetails.html
@@ -20,8 +20,10 @@
           <dd>{{stage.context.baseOs}}</dd>
           <dt>Label</dt>
           <dd>{{stage.context.baseLabel}}</dd>
-          <dt ng-if="roscoMode || stage.context.rebake">Rebake</dt>
-          <dd ng-if="roscoMode || stage.context.rebake">{{stage.context.rebake || false}}</dd>
+          <dt ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">Rebake</dt>
+          <dd ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">
+            {{execution.trigger.rebake || stage.context.rebake || false}}
+          </dd>
           <dt ng-if="stage.context.templateFileName">Template</dt>
           <dd ng-if="stage.context.templateFileName">{{stage.context.templateFileName}}</dd>
           <dt ng-if="stage.context.varFileName">Var File</dt>

diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.html
@@ -20,8 +20,10 @@
           <dd>{{stage.context.baseOs}}</dd>
           <dt>Label</dt>
           <dd>{{stage.context.baseLabel}}</dd>
-          <dt ng-if="roscoMode || stage.context.rebake">Rebake</dt>
-          <dd ng-if="roscoMode || stage.context.rebake">{{stage.context.rebake || false}}</dd>
+          <dt ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">Rebake</dt>
+          <dd ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">
+            {{execution.trigger.rebake || stage.context.rebake || false}}
+          </dd>
           <dt ng-if="stage.context.templateFileName">Template</dt>
           <dd ng-if="stage.context.templateFileName">{{stage.context.templateFileName}}</dd>
           <dt ng-if="stage.context.accountName">Account Name</dt>

diff --git a/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/openstack/src/pipeline/stages/bake/bakeExecutionDetails.html
@@ -20,8 +20,10 @@
           <dd>{{stage.context.baseOs}}</dd>
           <dt>Label</dt>
           <dd>{{stage.context.baseLabel}}</dd>
-          <dt ng-if="roscoMode || stage.context.rebake">Rebake</dt>
-          <dd ng-if="roscoMode || stage.context.rebake">{{stage.context.rebake || false}}</dd>
+          <dt ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">Rebake</dt>
+          <dd ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">
+            {{execution.trigger.rebake || stage.context.rebake || false}}
+          </dd>
           <dt ng-if="stage.context.templateFileName">Template</dt>
           <dd ng-if="stage.context.templateFileName">{{stage.context.templateFileName}}</dd>
         </dl>

diff --git a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.html
@@ -18,8 +18,10 @@
         <dl class="dl-narrow dl-horizontal">
           <dt>Base Image</dt>
           <dd>{{stage.context.baseOs}}</dd>
-          <dt ng-if="roscoMode || stage.context.rebake">Rebake</dt>
-          <dd ng-if="roscoMode || stage.context.rebake">{{stage.context.rebake || false}}</dd>
+          <dt ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">Rebake</dt>
+          <dd ng-if="roscoMode || execution.trigger.rebake || stage.context.rebake">
+            {{execution.trigger.rebake || stage.context.rebake || false}}
+          </dd>
           <dt ng-if="stage.context.templateFileName">Template</dt>
           <dd ng-if="stage.context.templateFileName">{{stage.context.templateFileName}}</dd>
           <dt ng-if="stage.context.varFileName">Var File</dt>