Merge pull request #174 from dazjones/spec-properties

Added properties to spec

Author: Darren Jones

ci/manifests/jenkins.yml

@@ -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:

jobs/jenkins-master/spec

@@ -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"
+

jobs/jenkins-master/templates/config/config.xml.erb

@@ -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>