diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:08:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:08:43 +0300 |
| commit | 733befe96ad19f5a02e442c4a9cc8059d3aabbda (patch) | |
| tree | dcabd344df040e536a242edc4e3121fb3efca142 /spec/fixtures | |
| parent | 10213bf3b26c3c21f7683471d35d1cd052c41e9c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/deployment.json | 2 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/deployment_cluster.json (renamed from spec/fixtures/api/schemas/cluster_basic.json) | 6 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/job/job_details.json | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/deployment.json b/spec/fixtures/api/schemas/deployment.json index 0cfeadfe548..ac37dd084d3 100644 --- a/spec/fixtures/api/schemas/deployment.json +++ b/spec/fixtures/api/schemas/deployment.json @@ -50,7 +50,7 @@ "cluster": { "oneOf": [ { "type": "null" }, - { "$ref": "cluster_basic.json" } + { "$ref": "deployment_cluster.json" } ] }, "manual_actions": { diff --git a/spec/fixtures/api/schemas/cluster_basic.json b/spec/fixtures/api/schemas/deployment_cluster.json index 6f0e77997f0..86497f98dcb 100644 --- a/spec/fixtures/api/schemas/cluster_basic.json +++ b/spec/fixtures/api/schemas/deployment_cluster.json @@ -10,6 +10,12 @@ { "type": "null" }, { "type": "string" } ] + }, + "kubernetes_namespace": { + "oneOf": [ + { "type": "null" }, + { "type": "string" } + ] } }, "additionalProperties": false diff --git a/spec/fixtures/api/schemas/job/job_details.json b/spec/fixtures/api/schemas/job/job_details.json index cdf7b049ab6..ae05ecea9ef 100644 --- a/spec/fixtures/api/schemas/job/job_details.json +++ b/spec/fixtures/api/schemas/job/job_details.json @@ -15,6 +15,12 @@ "terminal_path": { "type": "string" }, "trigger": { "$ref": "trigger.json" }, "deployment_status": { "$ref": "deployment_status.json" }, + "deployment_cluster": { + "oneOf": [ + { "$ref": "../deployment_cluster.json" }, + { "type": "null" } + ] + }, "runner": { "$ref": "runner.json" }, "runners": { "$ref": "runners.json" }, "has_trace": { "type": "boolean" }, |