File tree Expand file tree Collapse file tree 4 files changed +20
-12
lines changed Expand file tree Collapse file tree 4 files changed +20
-12
lines changed Original file line number Diff line number Diff line change @@ -280,7 +280,15 @@ knife vault create master scabot-keypair \
280
280
--admins adriaan
281
281
282
282
knife vault create master scabot \
283
- --json $PWD/.chef/scabot.json \
283
+ {
284
+ "jenkins": {
285
+ "token": "..."
286
+ },
287
+ "github": {
288
+ "scala": {"token": "..."}
289
+ "lampepfl": {"token": "..."}
290
+ }
291
+ }
284
292
--search 'name:jenkins-master' \
285
293
--admins adriaan
286
294
Original file line number Diff line number Diff line change 121
121
default [ 'master' ] [ 'ec2-start-stop' ] [ 'url' ] = 'https://dl.dropboxusercontent.com/u/12862572/ec2-start-stop.hpi'
122
122
123
123
# SCABOT
124
- default [ 'scabot' ] [ 'jenkins' ] [ 'user' ] = "scala-jenkins"
125
- default [ 'scabot' ] [ 'github' ] [ 'repo_user' ] = "scala"
124
+ default [ 'scabot' ] [ 'jenkins' ] [ 'user' ] = "scala-jenkins"
126
125
end
Original file line number Diff line number Diff line change 59
59
revision "master"
60
60
end
61
61
62
- # TODO: do not use node.set for sensitive stuff!!
63
- node . set [ 'scabot' ] [ 'github' ] [ 'token' ] = chef_vault_item ( "master" , "scabot" ) [ 'github' ] [ 'token' ]
64
- node . set [ 'scabot' ] [ 'jenkins' ] [ 'token' ] = chef_vault_item ( "master" , "scabot" ) [ 'jenkins' ] [ 'token' ]
65
-
66
62
template "#{ scabotHome } /scabot.conf" do
67
63
source 'scabot.conf.erb'
68
64
user scabotUser
69
65
sensitive true
66
+
67
+ variables ( {
68
+ :scabotVault => chef_vault_item ( "master" , "scabot" )
69
+ } )
70
+
70
71
end
71
72
72
73
bash 'build scabot' do
Original file line number Diff line number Diff line change 1
1
scala: {
2
2
jenkins: {
3
- job: "scala-2.11.x-validate-main"
4
- jobPrefix: "scala-2.11.x-" // this will be stripped when reporting to github TODO: remove once it's computed as s"${github.repo}-${pull.base.ref}-"
3
+ jobSuffix: "validate-main"
5
4
host: "<%= node['master']['jenkinsHost']%> "
6
5
user: "<%= node['scabot']['jenkins']['user']%> "
7
- token: "<%= node['scabot'] ['jenkins']['token']%> "
6
+ token: "<%= @scabotVault ['jenkins']['token']%> "
8
7
}
9
8
github: {
10
- user: "<%= node['scabot']['github']['repo_user']%> "
11
9
repo: "scala"
10
+ branches: ["2.11.x", "2.12.x"]
12
11
host: "api.github.com"
13
- token: "<%= node['scabot']['github']['token']%> "
12
+ user: "scala"
13
+ token: "<%= @scabotVault['github']['scala']['token']%> "
14
14
}
15
15
}
You can’t perform that action at this time.
0 commit comments