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

Commit d405459

Browse files
author
Darren Jones
committed
Added test vars to manifest
1 parent ce5ef82 commit d405459

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

ci/manifests/jenkins.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ instance_groups:
1818
address: http://localhost:8080/
1919
github:
2020
oauth:
21-
org_name: ((github_oauth_org_name))
21+
org_name: "test-org"
2222
admins:
23-
admin1: ((jenkins_oauth_admin_user_1))
24-
admin2: ((jenkins_oauth_admin_user_2))
25-
admin3: ((jenkins_oauth_admin_user_3))
23+
admin1: "admin1"
24+
admin2: "admin2"
25+
admin3: "admin3"
2626
url:
27-
web: ((jenkins_oauth_github_web_ui))
28-
api: ((jenkins_oauth_github_api_ui))
27+
web: "http://finkit.io"
28+
api: "http://finkit.io"
2929
client:
30-
id: ((jenkins_oauth_clientID))
31-
secret: ((jenkins_oauth_clientSecret))
30+
id: "00000"
31+
secret: "0000"
3232
networks:
3333
- name: default
3434
persistent_disk_pool: 10GB

jobs/jenkins-master/spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: jenkins-master
33

4-
packages:
4+
packages:
55
- oraclejdk
66
- jenkins
77
- git-client
@@ -20,6 +20,7 @@ templates:
2020
bin/restore.sh.erb: bin/bbr/restore
2121
config/branding.css.erb: config/branding.css
2222
config/config.xml.erb: config/config.xml
23+
config/config-oauth.xml.erb: config/config-oauth.xml
2324
config/configure-access.groovy.erb: init.groovy.d/configure-access.groovy
2425
config/configure-master-access-control.groovy.erb: init.groovy.d/configure-master-access-control.groovy
2526
config/configure-maven.groovy.erb: init.groovy.d/configure-maven.groovy

0 commit comments

Comments
 (0)