Skip to content
This repository was archived by the owner on Jul 17, 2018. It is now read-only.

Added properties to spec #174

Merged
dazjones merged 1 commit into from
Apr 27, 2018
Merged

Added properties to spec #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/manifests/jenkins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ instance_groups:
oauth:
org_name: ((github_oauth_org_name))
admins:
user1: ((jenkins_oauth_admin_user_1))
admin1: ((jenkins_oauth_admin_user_1))
admin2: ((jenkins_oauth_admin_user_2))
admin3: ((jenkins_oauth_admin_user_3))
url:
Expand Down
17 changes: 17 additions & 0 deletions jobs/jenkins-master/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,20 @@ properties:
description: "Password for the admin user"
jenkins.agent.password:
description: "Password for the agent user"
jenkins.github.oauth.org_name:
description: "Github oAuth org name"
jenkins.github.oauth.admins.admin1:
description: "Github admin username"
jenkins.github.oauth.admins.admin2:
description: "Github admin username"
jenkins.github.oauth.admins.admin3:
description: "Github admin username"
jenkins.github.oauth.url.web:
description: "Github web url"
jenkins.github.oauth.url.api:
description: "Github api url"
jenkins.github.oauth.client.id:
description: "Github client ID"
jenkins.github.oauth.client.secret:
description: "Github client.secret"

6 changes: 3 additions & 3 deletions jobs/jenkins-master/templates/config/config.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<string><%= p('jenkins.github.oauth.org_name') %></string>
</organizationNameList>
<adminUserNameList class="linked-list">
<string><%= p('jenkins.github.oauth.admin.user1') %></string>
<string><%= p('jenkins.github.oauth.admin.user2') %></string>
<string><%= p('jenkins.github.oauth.admin.user3') %></string>
<string><%= p('jenkins.github.oauth.admins.admin1') %></string>
<string><%= p('jenkins.github.oauth.admins.admin2') %></string>
<string><%= p('jenkins.github.oauth.admins.admin3') %></string>
</adminUserNameList>
<authenticatedUserReadPermission>false</authenticatedUserReadPermission>
<useRepositoryPermissions>false</useRepositoryPermissions>
Expand Down