diff --git a/src/main/groovy/io/seqera/wave/controller/ViewController.groovy b/src/main/groovy/io/seqera/wave/controller/ViewController.groovy index 60ba05537..1a4d9ba95 100644 --- a/src/main/groovy/io/seqera/wave/controller/ViewController.groovy +++ b/src/main/groovy/io/seqera/wave/controller/ViewController.groovy @@ -75,6 +75,8 @@ class ViewController { final binding = new HashMap(20) binding.build_id = result.buildId binding.build_success = result.succeeded() + binding.build_failed = result.exitStatus && result.exitStatus != 0 + binding.build_in_progress = result.exitStatus == null binding.build_exit_status = result.exitStatus binding.build_user = (result.userName ?: '-') + " (ip: ${result.requestIp})" binding.build_time = formatTimestamp(result.startTime, result.offsetId) ?: '-' diff --git a/src/main/resources/io/seqera/wave/build-view.hbs b/src/main/resources/io/seqera/wave/build-view.hbs index 5cb33235f..acceacc55 100644 --- a/src/main/resources/io/seqera/wave/build-view.hbs +++ b/src/main/resources/io/seqera/wave/build-view.hbs @@ -1,6 +1,9 @@ + {{#if build_in_progress}} + + {{/if}} @@ -16,17 +19,50 @@ {{#if build_success}} -
-

- Container build completed successfully! -

-
- {{else}} -
-

- Container build failed -

-
+
+

+ Container build completed successfully! +

+
+ {{else build_failed}} +
+

+ Container build failed +

+
+ {{else build_in_progress}} + {{! build is not completed, show a spinning icon }} + +
+

+
Container build in progress +

+
{{/if}}

Summary

@@ -75,36 +111,35 @@ Exit status {{build_exit_status}} - {{#if scan_url}} - - Security - Image scan report - - {{/if}} + {{#if scan_url}} + + Security + Image scan report + + {{/if}}

Container file

{{build_containerfile}}
{{#if build_condafile}} -

Conda file

- 
{{build_condafile}}
+

Conda file

+ 
{{build_condafile}}
{{/if}} {{#if build_spackfile}} -

Spack file

- 
{{build_spackfile}}
+

Spack file

+ 
{{build_spackfile}}
{{/if}} {{#if build_log_data}} -

Build logs

- 
{{build_log_data}}
- {{#if build_log_truncated}} - Click here to download the complete build log - {{/if}} +

Build logs

+ 
{{build_log_data}}
+ {{#if build_log_truncated}} + Click here to download the complete build log + {{/if}} {{/if}} -
diff --git a/src/test/groovy/io/seqera/wave/controller/ViewControllerTest.groovy b/src/test/groovy/io/seqera/wave/controller/ViewControllerTest.groovy index 772d61151..e4447cbc1 100644 --- a/src/test/groovy/io/seqera/wave/controller/ViewControllerTest.groovy +++ b/src/test/groovy/io/seqera/wave/controller/ViewControllerTest.groovy @@ -102,6 +102,9 @@ class ViewControllerTest extends Specification { binding.build_log_data == 'log content' binding.build_log_truncated == false binding.build_log_url == 'http://foo.com/v1alpha1/builds/12345/logs' + binding.build_success == true + binding.build_in_progress == false + binding.build_failed == false } def 'should render a build page' () { @@ -228,4 +231,91 @@ class ViewControllerTest extends Specification { then: response.body().contains(token) } + + def 'should render in progress build page' () { + given: + def controller = new ViewController(serverUrl: 'http://foo.com', buildLogService: buildLogService) + and: + def record = new WaveBuildRecord( + buildId: '12345', + dockerFile: 'FROM foo', + condaFile: 'conda::foo', + spackFile: 'some-spack-recipe', + targetImage: 'docker.io/some:image', + userName: 'paolo', + userEmail: 'paolo@seqera.io', + userId: 100, + requestIp: '10.20.30.40', + startTime: Instant.now(), + offsetId: '+02:00', + duration: Duration.ofMinutes(1), + platform: 'linux/amd64' ) + when: + def binding = controller.renderBuildView(record) + then: + 1 * buildLogService.fetchLogString('12345') >> new BuildLogService.BuildLog('log content', false) + and: + binding.build_id == '12345' + binding.build_containerfile == 'FROM foo' + binding.build_condafile == 'conda::foo' + binding.build_image == 'docker.io/some:image' + binding.build_user == 'paolo (ip: 10.20.30.40)' + binding.build_platform == 'linux/amd64' + binding.build_exit_status == null + binding.build_platform == 'linux/amd64' + binding.build_containerfile == 'FROM foo' + binding.build_condafile == 'conda::foo' + binding.build_spackfile == 'some-spack-recipe' + binding.build_format == 'Docker' + binding.build_log_data == 'log content' + binding.build_log_truncated == false + binding.build_log_url == 'http://foo.com/v1alpha1/builds/12345/logs' + binding.build_success == false + binding.build_in_progress == true + binding.build_failed == false + } + + def 'should render in progress build page' () { + given: + def controller = new ViewController(serverUrl: 'http://foo.com', buildLogService: buildLogService) + and: + def record = new WaveBuildRecord( + buildId: '12345', + dockerFile: 'FROM foo', + condaFile: 'conda::foo', + spackFile: 'some-spack-recipe', + targetImage: 'docker.io/some:image', + userName: 'paolo', + userEmail: 'paolo@seqera.io', + userId: 100, + requestIp: '10.20.30.40', + startTime: Instant.now(), + offsetId: '+02:00', + duration: Duration.ofMinutes(1), + exitStatus: 1, + platform: 'linux/amd64' ) + when: + def binding = controller.renderBuildView(record) + then: + 1 * buildLogService.fetchLogString('12345') >> new BuildLogService.BuildLog('log content', false) + and: + binding.build_id == '12345' + binding.build_containerfile == 'FROM foo' + binding.build_condafile == 'conda::foo' + binding.build_image == 'docker.io/some:image' + binding.build_user == 'paolo (ip: 10.20.30.40)' + binding.build_platform == 'linux/amd64' + binding.build_exit_status == 1 + binding.build_platform == 'linux/amd64' + binding.build_containerfile == 'FROM foo' + binding.build_condafile == 'conda::foo' + binding.build_spackfile == 'some-spack-recipe' + binding.build_format == 'Docker' + binding.build_log_data == 'log content' + binding.build_log_truncated == false + binding.build_log_url == 'http://foo.com/v1alpha1/builds/12345/logs' + binding.build_success == false + binding.build_in_progress == false + binding.build_failed == true + } }