Skip to content

Commit 3407ec9

Browse files
authored
Added queued_duration for Pipelines and Jobs (#930)
* Added hook and fetch capabilities * Fix tests * Remove superfluous formatting
1 parent 37503e0 commit 3407ec9

File tree

6 files changed

+38
-5
lines changed

6 files changed

+38
-5
lines changed

src/main/java/org/gitlab4j/api/models/Job.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class Job {
2929
private Boolean manual;
3030
private Boolean allowFailure;
3131
private Float duration;
32+
private Float queuedDuration;
3233
private Project project;
3334

3435
public Long getId() {
@@ -206,11 +207,18 @@ public Float getDuration() {
206207
public void setDuration(Float duration) {
207208
this.duration = duration;
208209
}
209-
210+
211+
public Float getQueuedDuration() {
212+
return queuedDuration;
213+
}
214+
215+
public void setQueuedDuration(Float queuedDuration) {
216+
this.queuedDuration = queuedDuration;
217+
}
218+
210219
public Project getProject() {
211220
return project;
212221
}
213-
214222
public void setProject(Project project) {
215223
this.project = project;
216224
}
@@ -304,12 +312,16 @@ public Job withAllowFailure(Boolean allowFailure) {
304312
this.allowFailure = allowFailure;
305313
return this;
306314
}
307-
308315
public Job withDuration(Float duration) {
309316
this.duration = duration;
310317
return this;
311318
}
312-
319+
320+
public Job withQueuedDuration(Float queuedDuration) {
321+
this.queuedDuration = queuedDuration;
322+
return this;
323+
}
324+
313325
public Job withProject(Project project) {
314326
this.project = project;
315327
return this;

src/main/java/org/gitlab4j/api/models/Pipeline.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class Pipeline {
2222
private Date committedAt;
2323
private String coverage;
2424
private Integer duration;
25+
private Float queuedDuration;
2526
private String webUrl;
2627
private DetailedStatus detailedStatus;
2728

@@ -225,6 +226,14 @@ public void setDuration(Integer duration) {
225226
this.duration = duration;
226227
}
227228

229+
public Float getQueuedDuration() {
230+
return queuedDuration;
231+
}
232+
233+
public void setQueuedDuration(Float queuedDuration) {
234+
this.queuedDuration = queuedDuration;
235+
}
236+
228237
public String getWebUrl() {
229238
return webUrl;
230239
}

src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public static class ObjectAttributes {
8181
private Date createdAt;
8282
private Date finishedAt;
8383
private Integer duration;
84+
private Float queuedDuration;
8485
private List<Variable> variables;
8586

8687
public Long getId() {
@@ -171,6 +172,14 @@ public void setDuration(Integer duration) {
171172
this.duration = duration;
172173
}
173174

175+
public Float getQueuedDuration() {
176+
return queuedDuration;
177+
}
178+
179+
public void setQueuedDuration(Float queuedDuration) {
180+
this.queuedDuration = queuedDuration;
181+
}
182+
174183
public List<Variable> getVariables() {
175184
return variables;
176185
}

src/test/resources/org/gitlab4j/api/job.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"web_url": "https://example.com/foo/bar/-/jobs/7",
3939
"allow_failure": false,
4040
"duration": 0.465,
41+
"queued_duration": 0.010,
4142
"user": {
4243
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
4344
"created_at": "2015-12-21T13:14:24.077Z",

src/test/resources/org/gitlab4j/api/pipeline-event.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"created_at": "2016-08-12T15:23:28Z",
1717
"finished_at": "2016-08-12T15:26:29Z",
1818
"duration": 63,
19+
"queued_duration": 0.010,
1920
"variables": [
2021
{
2122
"key": "NESTOR_PROD_ENVIRONMENT",

src/test/resources/org/gitlab4j/api/pipeline.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"updated_at": "2016-08-11T11:32:35.169Z",
1919
"finished_at": "2016-08-11T11:32:35.145Z",
2020
"coverage": "30.0",
21+
"queued_duration": 0.010,
2122
"detailed_status": {
2223
"icon": "status_pending",
2324
"text": "pending",
@@ -28,4 +29,4 @@
2829
"details_path": "/gitlab4j/test-project/pipelines/66",
2930
"favicon": "/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png"
3031
}
31-
}
32+
}

0 commit comments

Comments
 (0)