Skip to content

Commit 7b7bcf0

Browse files
authored
Merge pull request #206 from SethTisue/so-long-dotty
bye bye Dotty
2 parents d048fdd + 5e6a111 commit 7b7bcf0

File tree

8 files changed

+1
-136
lines changed

8 files changed

+1
-136
lines changed

.chef/scabot-keypair.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
"github": {
77
"scala": {
88
"token": "XXX"
9-
},
10-
"lampepfl": {
11-
"token": "XXX"
129
}
1310
},
1411
"play": {
1512
"cryptoSecret": "XXX"
1613
}
17-
}
14+
}

doc/genesis.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ knife vault create master scabot \
235235
},
236236
"github": {
237237
"scala": {"token": "..."}
238-
"lampepfl": {"token": "..."}
239238
}
240239
}
241240
--search 'name:jenkins-master' \

recipes/_master-jenkins-jobs.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ def expandJobTemplates(user, repo, branch)
9191
expandJobTemplates("scala", "scala", branch)
9292
end
9393

94-
# create dotty-$branch-$jobName for every template under jobs/
95-
%w{ master }.each do | branch |
96-
expandJobTemplates("lampepfl", "dotty", branch)
97-
end
98-
99-
10094
# TODO #10: make a view for each top-level directory under jobs/ that lists all jobs under it (scala-2.11.x-integrate, scala-2.11.x-release, scala-2.11.x-validate)
10195
# https://issues.jenkins-ci.org/browse/JENKINS-8927
10296
def viewXML(viewPrefix)

templates/default/jobs/lampepfl/validate/junit.xml.erb

Lines changed: 0 additions & 26 deletions
This file was deleted.

templates/default/jobs/lampepfl/validate/main.xml.erb

Lines changed: 0 additions & 29 deletions
This file was deleted.

templates/default/jobs/lampepfl/validate/partest-bootstrapped.xml.erb

Lines changed: 0 additions & 26 deletions
This file was deleted.

templates/default/jobs/lampepfl/validate/partest.xml.erb

Lines changed: 0 additions & 26 deletions
This file was deleted.

templates/default/scabot.conf.erb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,3 @@ scala: {
1515
token: "<%=@scabotVault['github']['scala']['token']%>"
1616
}
1717
}
18-
19-
dotty: {
20-
jenkins: {
21-
jobSuffix: "validate-main"
22-
host: "<%=node['master']['jenkinsHost']%>"
23-
user: "<%=node['scabot']['jenkins']['user']%>"
24-
token: "<%=@scabotVault['jenkins']['token']%>"
25-
}
26-
github: {
27-
user: "lampepfl"
28-
repo: "dotty"
29-
branches: ["master"]
30-
lastCommitOnly: true
31-
checkCLA: true
32-
host: "api.github.com"
33-
token: "<%=@scabotVault['github']['lampepfl']['token']%>"
34-
}
35-
}

0 commit comments

Comments
 (0)