Merge pull request #178 from dazjones/test-vars

Added test vars to manifest

Author: Darren Jones

ci/manifests/jenkins.yml

@@ -18,17 +18,17 @@ instance_groups:
           address: http://localhost:8080/
         github:
           oauth:
-            org_name: ((github_oauth_org_name))
+            org_name: "test-org"
             admins:
-              admin1: ((jenkins_oauth_admin_user_1))
-              admin2: ((jenkins_oauth_admin_user_2))
-              admin3: ((jenkins_oauth_admin_user_3))
+              admin1: "admin1"
+              admin2: "admin2"
+              admin3: "admin3"
             url:
-              web: ((jenkins_oauth_github_web_ui))
-              api: ((jenkins_oauth_github_api_ui))
+              web: "http://finkit.io"
+              api: "http://finkit.io"
             client:
-              id: ((jenkins_oauth_clientID))
-              secret: ((jenkins_oauth_clientSecret))
+              id: "00000"
+              secret: "0000"
   networks:
   - name: default
   persistent_disk_pool: 10GB

jobs/jenkins-master/spec

@@ -1,7 +1,7 @@
 ---
 name: jenkins-master
 
-packages: 
+packages:
 - oraclejdk
 - jenkins
 - git-client
@@ -20,6 +20,7 @@ templates:
   bin/restore.sh.erb: bin/bbr/restore
   config/branding.css.erb: config/branding.css
   config/config.xml.erb: config/config.xml
+  config/config-oauth.xml.erb: config/config-oauth.xml
   config/configure-access.groovy.erb: init.groovy.d/configure-access.groovy
   config/configure-master-access-control.groovy.erb: init.groovy.d/configure-master-access-control.groovy
   config/configure-maven.groovy.erb: init.groovy.d/configure-maven.groovy