Commit 8a3e5d96 authored by Ruben Davila's avatar Ruben Davila

Fix broken specs related to Jenkins service.

parent e707ffe6
...@@ -825,8 +825,8 @@ Parameters: ...@@ -825,8 +825,8 @@ Parameters:
- `jenkins_url` (**required**) - Jenkins URL like http://jenkins.example.com - `jenkins_url` (**required**) - Jenkins URL like http://jenkins.example.com
- `project_name` (**required**) - The URL-friendly project name. Example: my_project_name - `project_name` (**required**) - The URL-friendly project name. Example: my_project_name
- `username` (**required**) - A user with permissions to trigger a manual build - `username` (optional) - A user with access to the Jenkins server, if applicable
- `password` (**required**) - `password` (optional) - The password of the user
### Delete Jenkins CI service ### Delete Jenkins CI service
...@@ -844,5 +844,40 @@ Get Jenkins CI service settings for a project. ...@@ -844,5 +844,40 @@ Get Jenkins CI service settings for a project.
GET /projects/:id/services/jenkins GET /projects/:id/services/jenkins
``` ```
## Jenkins CI (Deprecated) Service
A continuous integration and build server
### Create/Edit Jenkins CI (Deprecated) service
Set Jenkins CI (Deprecated) service for a project.
```
PUT /projects/:id/services/jenkins-deprecated
```
Parameters:
- `project_url` (**required**) - Jenkins project URL like http://jenkins.example.com/job/my-project/
- `multiproject_enabled` (optional) - Multi-project mode is configured in Jenkins Gitlab Hook plugin
- `pass_unstable` (optional) - Unstable builds will be treated as passing
### Delete Jenkins CI (Deprecated) service
Delete Jenkins CI (Deprecated) service for a project.
```
DELETE /projects/:id/services/jenkins-deprecated
```
### Get Jenkins CI (Deprecated) service settings
Get Jenkins CI (Deprecated) service settings for a project.
```
GET /projects/:id/services/jenkins-deprecated
```
[jira-doc]: ../project_services/jira.md [jira-doc]: ../project_services/jira.md
[old-jira-api]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/api/services.md#jira [old-jira-api]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/api/services.md#jira
...@@ -52,7 +52,7 @@ module API ...@@ -52,7 +52,7 @@ module API
required: true, required: true,
name: :password, name: :password,
type: String, type: String,
desc: 'Passord of the user' desc: 'Password of the user'
} }
], ],
'bugzilla' => [ 'bugzilla' => [
...@@ -351,7 +351,6 @@ module API ...@@ -351,7 +351,6 @@ module API
desc: 'The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`' desc: 'The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`'
} }
], ],
'kubernetes' => [ 'kubernetes' => [
{ {
required: true, required: true,
...@@ -533,7 +532,7 @@ module API ...@@ -533,7 +532,7 @@ module API
required: true, required: true,
name: :jenkins_url, name: :jenkins_url,
type: String, type: String,
desc: 'Jenkins URL like http://jenkins.example.com' desc: 'Jenkins root URL like https://jenkins.example.com'
}, },
{ {
required: true, required: true,
...@@ -542,13 +541,13 @@ module API ...@@ -542,13 +541,13 @@ module API
desc: 'The URL-friendly project name. Example: my_project_name' desc: 'The URL-friendly project name. Example: my_project_name'
}, },
{ {
required: true, required: false,
name: :username, name: :username,
type: String, type: String,
desc: 'The username with permissions to trigger a manual build' desc: 'A user with access to the Jenkins server, if applicable'
}, },
{ {
required: true, required: false,
name: :password, name: :password,
type: String, type: String,
desc: 'The password of the user' desc: 'The password of the user'
......
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