diff --git a/attributes/worker.rb b/attributes/worker.rb index e74520c..af48ea9 100644 --- a/attributes/worker.rb +++ b/attributes/worker.rb @@ -1,6 +1,7 @@ # ssh public keys for users with access to workers workerAuthorizedKeys = - "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAva5WQeMGZxgQ1adlJQoYZCJZYTkVYSSKWu9O3EDJD+2jncUFfUdd4AsYbpYs/N2FyeoT2Gja7c03dFI6gQP3d+ZNaiO3CBYC6LvbgmCaQrffymiYw8jgD0NQqRan0nwXblmQlkxktgU0oSI/NmkpsNsMx67Pgrd+UsCchuFl7LR0CD6q+URt6Y38TY8F2x4k8P7Y2aWoQOuPk8bvEMALaOetSH0Y8zNEP5YPf7k30Z8ZUyhkt0x166gKoO/2PlzTjy5cAi+sDdCIxd74Ll7jzaUa10BDpl1iOHtLEkTJ0pssENm0g+PvJcsyzGhBRfGSLxEDhBRw1hPRT1avOwIeJQ== lrytz\n" + "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAva5WQeMGZxgQ1adlJQoYZCJZYTkVYSSKWu9O3EDJD+2jncUFfUdd4AsYbpYs/N2FyeoT2Gja7c03dFI6gQP3d+ZNaiO3CBYC6LvbgmCaQrffymiYw8jgD0NQqRan0nwXblmQlkxktgU0oSI/NmkpsNsMx67Pgrd+UsCchuFl7LR0CD6q+URt6Y38TY8F2x4k8P7Y2aWoQOuPk8bvEMALaOetSH0Y8zNEP5YPf7k30Z8ZUyhkt0x166gKoO/2PlzTjy5cAi+sDdCIxd74Ll7jzaUa10BDpl1iOHtLEkTJ0pssENm0g+PvJcsyzGhBRfGSLxEDhBRw1hPRT1avOwIeJQ== lrytz\n"+ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVEPiQw/dw1d3YNZJ9xEoBmFGjCSIX6KSNA53PgrSTN3A1pv7bYYjlAyi4RDyrs7NyhboNm8JvDYB/MStJeFAMAsvSFcNNP1UdCZtom0+JrbdYid3MBN25PefShkjob8MgoTL+6VUYgYoip58MPGrHyGY0dH82QJHh1gyN9yGAgiKFrMpvD6h4m8FZrU1boLuMFty5FSBN7WEyC7p4+208MbH85iGzAGEeuW50CXqo21u/EFi+ZADCMaeyT81SKS25UXPKBWzrhsgk6vIH3EnmCiv1PtFmijaUhNCQrd6vAhyj6j6O4pjFZSWqvovD3WICGoCmUT/zlEajZllnnf0b darkdimius" if (node.name =~ /.*-worker-.*/) != nil case node["platform_family"] diff --git a/recipes/_master-jenkins-jobs.rb b/recipes/_master-jenkins-jobs.rb index 95804f5..bb1fa28 100644 --- a/recipes/_master-jenkins-jobs.rb +++ b/recipes/_master-jenkins-jobs.rb @@ -84,6 +84,11 @@ def expandJobTemplates(user, repo, branch) expandJobTemplates("scala", "scala", branch) end +# create dotty-$branch-$jobName for every template under jobs/ +%w{ master }.each do | branch | + expandJobTemplates("lampepfl", "dotty", branch) +end + # 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) # https://issues.jenkins-ci.org/browse/JENKINS-8927 diff --git a/templates/default/jobs/lampepfl/validate/junit.xml.erb b/templates/default/jobs/lampepfl/validate/junit.xml.erb new file mode 100644 index 0000000..bf76299 --- /dev/null +++ b/templates/default/jobs/lampepfl/validate/junit.xml.erb @@ -0,0 +1,16 @@ + + +<%= githubProject( + repoUser: @user, + repoName: "dotty", + repoRef: @branch, + description: "PR validation", + nodeRestriction: "public", + params: [ + {:name => "_scabot_pr", :desc => "For internal use by Scabot."} + ], + jvmVersion: 8, + jvmFlavor: "openjdk", + buildNameScript: setValidateBuildNameScript) +%> + \ No newline at end of file diff --git a/templates/default/jobs/lampepfl/validate/main.xml.erb b/templates/default/jobs/lampepfl/validate/main.xml.erb new file mode 100644 index 0000000..9ffc649 --- /dev/null +++ b/templates/default/jobs/lampepfl/validate/main.xml.erb @@ -0,0 +1,28 @@ + + +<%= flowProject( + repoUser: @user, + repoName: "dotty", + repoRef: @branch, + description: "PR validation", + params: [ + {:name => "_scabot_pr", :desc => "For internal use by Scabot."} + ], + buildNameScript: setValidateBuildNameScript, + dsl: <<-EOX +parallel ( + { build(params, "#{job("validate/partest")}") }, + { build(params, "#{job("validate/junit")}") }, + { build(params, "#{job("validate/scalastyle")}") } +) + +EOX +) %> + + + dotty-reports@googlegroups.com + false + false + + + diff --git a/templates/default/jobs/lampepfl/validate/partest.xml.erb b/templates/default/jobs/lampepfl/validate/partest.xml.erb new file mode 100644 index 0000000..bf76299 --- /dev/null +++ b/templates/default/jobs/lampepfl/validate/partest.xml.erb @@ -0,0 +1,16 @@ + + +<%= githubProject( + repoUser: @user, + repoName: "dotty", + repoRef: @branch, + description: "PR validation", + nodeRestriction: "public", + params: [ + {:name => "_scabot_pr", :desc => "For internal use by Scabot."} + ], + jvmVersion: 8, + jvmFlavor: "openjdk", + buildNameScript: setValidateBuildNameScript) +%> + \ No newline at end of file diff --git a/templates/default/jobs/lampepfl/validate/scalastyle.xml.erb b/templates/default/jobs/lampepfl/validate/scalastyle.xml.erb new file mode 100644 index 0000000..bf76299 --- /dev/null +++ b/templates/default/jobs/lampepfl/validate/scalastyle.xml.erb @@ -0,0 +1,16 @@ + + +<%= githubProject( + repoUser: @user, + repoName: "dotty", + repoRef: @branch, + description: "PR validation", + nodeRestriction: "public", + params: [ + {:name => "_scabot_pr", :desc => "For internal use by Scabot."} + ], + jvmVersion: 8, + jvmFlavor: "openjdk", + buildNameScript: setValidateBuildNameScript) +%> + \ No newline at end of file diff --git a/templates/default/scabot.conf.erb b/templates/default/scabot.conf.erb index 4fc5d6a..b102649 100755 --- a/templates/default/scabot.conf.erb +++ b/templates/default/scabot.conf.erb @@ -8,8 +8,26 @@ scala: { github: { repo: "scala" branches: ["2.11.x", "2.12.x"] + lastCommitOnly: false host: "api.github.com" user: "scala" token: "<%=@scabotVault['github']['scala']['token']%>" } } + +dotty: { + jenkins: { + jobSuffix: "validate-main" + host: "<%=node['master']['jenkinsHost']%>" + user: "<%=node['scabot']['jenkins']['user']%>" + token: "<%=@scabotVault['jenkins']['token']%>" + } + github: { + user: "lampepfl" + repo: "dotty" + branches: ["master"] + lastCommitOnly: true + host: "api.github.com" + token: "<%=@scabotVault['github']['lampepfl']['token']%>" + } +}