Commit 224714f2 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'gitlab-13.10'

9f1472de types: update for 13.10
ff7644c6

 test: update data for gitlab 13.10
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !283
parents a11161fb 9f1472de
This diff is collapsed.
......@@ -37,6 +37,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -126,6 +127,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -215,6 +217,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -304,6 +307,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -393,6 +397,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -482,6 +487,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -571,6 +577,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -660,6 +667,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -749,6 +757,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -838,6 +847,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -927,6 +937,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -1016,6 +1027,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -1105,6 +1117,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "success",
......@@ -1210,6 +1223,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "running",
......@@ -1292,6 +1306,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "running",
......@@ -1374,6 +1389,7 @@
"pipeline": {
"created_at": "2020-04-13T00:19:45.398-04:00",
"id": 168478,
"project_id": 855,
"ref": "master",
"sha": "0028f47612b928d94e5e1a4329f3e74d6fdd7032",
"status": "running",
......
......@@ -63,6 +63,7 @@
"duration": null,
"finished_at": "2016-10-04T15:56:53.868-04:00",
"id": 29191,
"project_id": 856,
"ref": "add_hook-api",
"sha": "04e94ae667024a62a90179f395bfdc2b35f3efd2",
"started_at": null,
......
......@@ -17,6 +17,7 @@
"duration": 0,
"finished_at": "2019-09-03T14:15:47.013-04:00",
"id": 145400,
"project_id": 855,
"ref": "master",
"sha": "7134adce4522c399cdab16e128b0a1af15b93f14",
"started_at": "2019-09-03T14:09:51.465-04:00",
......
{
"created_at": "2020-09-11T00:19:13.015-04:00",
"id": 188623,
"project_id": 855,
"ref": "master",
"sha": "767ea705c57ab41b68fa8bf69bb2e48172d3d6b1",
"status": "success",
......
......@@ -25,6 +25,7 @@
"ci_default_git_depth": null,
"ci_forward_deployment_enabled": null,
"container_registry_enabled": false,
"container_registry_image_prefix": "gitlab.kitware.com:4567/utils/rust-gitlab",
"created_at": "2016-06-29T13:35:12.495-04:00",
"creator_id": 13,
"default_branch": "master",
......@@ -40,7 +41,7 @@
"issues_access_level": "enabled",
"issues_enabled": true,
"jobs_enabled": true,
"last_activity_at": "2021-01-17T08:29:13.923-05:00",
"last_activity_at": "2021-03-19T08:43:22.840-04:00",
"lfs_enabled": false,
"merge_method": "merge",
"merge_requests_access_level": "enabled",
......@@ -59,7 +60,7 @@
},
"only_allow_merge_if_all_discussions_are_resolved": null,
"only_allow_merge_if_pipeline_succeeds": false,
"open_issues_count": 15,
"open_issues_count": 16,
"operations_access_level": "enabled",
"packages_enabled": null,
"pages_access_level": "enabled",
......
......@@ -10,6 +10,7 @@
"last_pipeline": {
"created_at": "2016-11-08T09:30:16.081-05:00",
"id": 34289,
"project_id": 855,
"ref": "master",
"sha": "de4ac3cf96cb8a0893be22b03f5171d934f9d392",
"status": "success",
......
......@@ -491,7 +491,7 @@ fn check_project_a(project: &Project) {
);
assert_eq!(
project.last_activity_at,
datetime((2021, 1, 17), (13, 29, 13, 923)),
datetime((2021, 3, 19), (12, 43, 22, 840)),
);
}
......@@ -506,7 +506,7 @@ fn check_project_b(project: &Project) {
assert_eq!(project.ci_config_path, None);
assert_eq!(project.star_count, 12);
assert_eq!(project.forks_count, 39);
assert_eq!(project.open_issues_count, Some(15));
assert_eq!(project.open_issues_count, Some(16));
assert_eq!(project.public_jobs, true);
assert!(project.shared_with_groups.is_empty());
assert_eq!(project.only_allow_merge_if_pipeline_succeeds, Some(false));
......@@ -670,6 +670,7 @@ fn test_read_repo_commit_detail() {
assert_eq!(stats.total, 8);
let last_pipeline = repo_commit_detail.last_pipeline.as_ref().unwrap();
assert_eq!(last_pipeline.id, PipelineId::new(34289));
assert_eq!(last_pipeline.project_id, ProjectId::new(855));
assert_eq!(last_pipeline.ref_.as_ref().unwrap(), "master");
assert_eq!(
last_pipeline.sha,
......@@ -785,6 +786,7 @@ fn test_read_pipelines() {
let pipeline_basic: PipelineBasic = read_test_file("pipeline_basic");
assert_eq!(pipeline_basic.id, PipelineId::new(188_623));
assert_eq!(pipeline_basic.project_id, ProjectId::new(855));
assert_eq!(pipeline_basic.status, StatusState::Success);
assert_eq!(pipeline_basic.ref_.as_ref().unwrap(), "master");
assert_eq!(
......@@ -810,6 +812,7 @@ fn test_read_pipeline() {
let pipeline: Pipeline = read_test_file("pipeline");
assert_eq!(pipeline.id, PipelineId::new(145_400));
assert_eq!(pipeline.project_id, ProjectId::new(855));
assert_eq!(pipeline.status, StatusState::Success);
assert_eq!(pipeline.ref_.as_ref().unwrap(), "master");
assert_eq!(
......@@ -1135,6 +1138,7 @@ fn test_read_running_job() {
assert_eq!(runner.is_shared, true);
assert_eq!(runner.name.unwrap(), "gitlab-runner");
assert_eq!(job.pipeline.id, PipelineId::new(168_478));
assert_eq!(job.pipeline.project_id, ProjectId::new(855));
assert_eq!(job.pipeline.ref_.unwrap(), "master");
assert_eq!(
job.pipeline.sha,
......
......@@ -2457,6 +2457,8 @@ impl_id!(PipelineId, "Type-safe pipeline ID.");
pub struct PipelineBasic {
/// The ID of the pipeline.
pub id: PipelineId,
/// The ID of the project holding the pipeline.
pub project_id: ProjectId,
#[serde(rename = "ref")]
/// The name of the reference that was tested.
pub ref_: Option<String>,
......@@ -2477,6 +2479,8 @@ pub struct PipelineBasic {
pub struct Pipeline {
/// The ID of the pipeline.
pub id: PipelineId,
/// The ID of the project holding the pipeline.
pub project_id: ProjectId,
/// The object ID that was tested.
pub sha: ObjectId,
#[serde(rename = "ref")]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment