Skip to content

Commit 5a88c56

Browse files
author
OpenShift Bot
authored
Merge pull request #957 from jwforres/pipeline-no-runs
Merged by openshift-bot
2 parents b503ddd + 2e167d3 commit 5a88c56

File tree

3 files changed

+68
-16
lines changed

3 files changed

+68
-16
lines changed

‎app/views/browse/build-config.html

+29-14
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,36 @@ <h1>
8686
<h2>No builds.</h2>
8787

8888
<p>
89-
<span ng-if="!('buildconfigs/instantiate' | canI : 'create')">
90-
Builds will create an image from
89+
<span ng-if="!buildConfig.spec.strategy.jenkinsPipelineStrategy">
90+
<span ng-if="!('buildconfigs/instantiate' | canI : 'create')">
91+
Builds will create an image from
92+
</span>
93+
<span ng-if="'buildconfigs/instantiate' | canI : 'create'">
94+
Start a new build to create an image from
95+
</span>
96+
<span ng-if="buildConfig.spec.source.type === 'Git'">
97+
source repository
98+
<span class="word-break"><osc-git-link
99+
uri="buildConfig.spec.source.git.uri"
100+
ref="buildConfig.spec.source.git.ref"
101+
context-dir="buildConfig.spec.source.contextDir">{{buildConfig.spec.source.git.uri}}</osc-git-link></span>
102+
</span>
103+
<span ng-if="buildConfig.spec.source.type !== 'Git'">
104+
build configuration {{buildConfig.metadata.name}}.
105+
</span>
91106
</span>
92-
<span ng-if="'buildconfigs/instantiate' | canI : 'create'">
93-
Start a new build to create an image from
94-
</span>
95-
<span ng-if="buildConfig.spec.source.type === 'Git'">
96-
source repository
97-
<span class="word-break"><osc-git-link
98-
uri="buildConfig.spec.source.git.uri"
99-
ref="buildConfig.spec.source.git.ref"
100-
context-dir="buildConfig.spec.source.contextDir">{{buildConfig.spec.source.git.uri}}</osc-git-link></span>
101-
</span>
102-
<span ng-if="buildConfig.spec.source.type !== 'Git'">
103-
build configuration {{buildConfig.metadata.name}}.
107+
<span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy">
108+
No pipeline builds have run for {{buildConfigName}}.
109+
<br>
110+
<span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile">
111+
View the <a ng-href="{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}">Jenkinsfile</a> to see what stages will run.
112+
</span>
113+
<span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath">
114+
View the file <code>{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}</code> in the
115+
<a ng-if="buildConfig | jenkinsfileLink" ng-href="buildConfig | jenkinsfileLink">source repository</a>
116+
<span ng-if="!(buildConfig | jenkinsfileLink)">source repository</span>
117+
to see what stages will run.
118+
</span>
104119
</span>
105120
</p>
106121

‎app/views/pipelines.html

+12-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,18 @@ <h2>{{buildConfigName}}</h2>
7979
</div>
8080
</div>
8181
<div ng-if="buildsLoaded && !(interestingBuildsByConfig[buildConfigName] | hashSize)">
82-
<em>No pipeline builds have run for {{buildConfigName}}.</em>
82+
<p>
83+
No pipeline builds have run for {{buildConfigName}}.
84+
<span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile">
85+
View the <a ng-href="{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}">Jenkinsfile</a> to see what stages will run.
86+
</span>
87+
<span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath">
88+
View the file <code>{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}</code> in the
89+
<a ng-if="buildConfig | jenkinsfileLink" ng-href="buildConfig | jenkinsfileLink">source repository</a>
90+
<span ng-if="!(buildConfig | jenkinsfileLink)">source repository</span>
91+
to see what stages will run.
92+
</span>
93+
</p>
8394
</div>
8495
<div ng-if="interestingBuildsByConfig[buildConfigName] | hashSize">
8596
<div ng-if="!(statsByConfig[buildConfigName].avgDuration | isNil)" class="hidden-xs pull-right text-muted">

‎dist/scripts/templates.js

+27-1
Original file line numberDiff line numberDiff line change
@@ -1774,6 +1774,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
17741774
"<div ng-if=\"buildConfig && unfilteredBuilds && (unfilteredBuilds | hashSize) === 0\" class=\"empty-state-message text-center\">\n" +
17751775
"<h2>No builds.</h2>\n" +
17761776
"<p>\n" +
1777+
"<span ng-if=\"!buildConfig.spec.strategy.jenkinsPipelineStrategy\">\n" +
17771778
"<span ng-if=\"!('buildconfigs/instantiate' | canI : 'create')\">\n" +
17781779
"Builds will create an image from\n" +
17791780
"</span>\n" +
@@ -1787,6 +1788,20 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
17871788
"<span ng-if=\"buildConfig.spec.source.type !== 'Git'\">\n" +
17881789
"build configuration {{buildConfig.metadata.name}}.\n" +
17891790
"</span>\n" +
1791+
"</span>\n" +
1792+
"<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy\">\n" +
1793+
"No pipeline builds have run for {{buildConfigName}}.\n" +
1794+
"<br>\n" +
1795+
"<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\">\n" +
1796+
"View the <a ng-href=\"{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}\">Jenkinsfile</a> to see what stages will run.\n" +
1797+
"</span>\n" +
1798+
"<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath\">\n" +
1799+
"View the file <code>{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}</code> in the\n" +
1800+
"<a ng-if=\"buildConfig | jenkinsfileLink\" ng-href=\"buildConfig | jenkinsfileLink\">source repository</a>\n" +
1801+
"<span ng-if=\"!(buildConfig | jenkinsfileLink)\">source repository</span>\n" +
1802+
"to see what stages will run.\n" +
1803+
"</span>\n" +
1804+
"</span>\n" +
17901805
"</p>\n" +
17911806
"<button class=\"btn btn-primary btn-lg\" ng-click=\"startBuild(buildConfig.metadata.name)\" ng-if=\"'buildconfigs/instantiate' | canI : 'create'\">\n" +
17921807
"<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
@@ -10666,7 +10681,18 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1066610681
"</div>\n" +
1066710682
"</div>\n" +
1066810683
"<div ng-if=\"buildsLoaded && !(interestingBuildsByConfig[buildConfigName] | hashSize)\">\n" +
10669-
"<em>No pipeline builds have run for {{buildConfigName}}.</em>\n" +
10684+
"<p>\n" +
10685+
"No pipeline builds have run for {{buildConfigName}}.\n" +
10686+
"<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\">\n" +
10687+
"View the <a ng-href=\"{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}\">Jenkinsfile</a> to see what stages will run.\n" +
10688+
"</span>\n" +
10689+
"<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath\">\n" +
10690+
"View the file <code>{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}</code> in the\n" +
10691+
"<a ng-if=\"buildConfig | jenkinsfileLink\" ng-href=\"buildConfig | jenkinsfileLink\">source repository</a>\n" +
10692+
"<span ng-if=\"!(buildConfig | jenkinsfileLink)\">source repository</span>\n" +
10693+
"to see what stages will run.\n" +
10694+
"</span>\n" +
10695+
"</p>\n" +
1067010696
"</div>\n" +
1067110697
"<div ng-if=\"interestingBuildsByConfig[buildConfigName] | hashSize\">\n" +
1067210698
"<div ng-if=\"!(statsByConfig[buildConfigName].avgDuration | isNil)\" class=\"hidden-xs pull-right text-muted\">\n" +

0 commit comments

Comments
 (0)