On Fri, 2016-10-07 at 08:22 +0000, Radu Cotescu wrote: > Hi Robert, > > The HTL integration tests were not run after changes in the HTL > modules, so > that's why I added those explicit downstream configurations. Do you > have a > better solution?
Downstream configurations are automatically detected for dependencies declared in the pom.xml file. They must be set manually for dependencies defined in the provisioning model ( but you did more than that ). With your recent change all should be fine. I've also documented this a bit at https://cwiki.apache.org/confluence/display/SLING/Sling+Jenkins+Setup #SlingJenkinsSetup-Managinginter-jobdependencies Thanks, Robert > > Thanks, > Radu > > On Fri, 7 Oct 2016 at 10:11 Robert Munteanu <[email protected]> > wrote: > > > Hi Radu, > > > > On Thu, 2016-10-06 at 17:08 +0000, [email protected] wrote: > > > Author: radu > > > Date: Thu Oct 6 17:08:14 2016 > > > New Revision: 1763633 > > > > > > URL: http://svn.apache.org/viewvc?rev=1763633&view=rev > > > Log: > > > SLING-6061 - Create per-module Jenkins jobs > > > > > > * added downstream builds for HTL > > > > > > The Jenkins jobs already infer dependencies based on the > > information > > defined in the pom.xml files. > > > > I added the 'downstream' parameter to work around for not detecting > > those dependencies for the provisioning model, but that does not > > seem > > to be what you are looking for. > > > > If you look for instance at the distribution-core job [1] you will > > see > > that it has 3 downstream projects, but there are none defined in > > the > > create_jobs.groovy script. > > > > What issue did you try to solve with this change? > > > > Robert > > > > > > > > > > > > Modified: > > > sling/trunk/tooling/jenkins/create_jobs.groovy > > > > > > Modified: sling/trunk/tooling/jenkins/create_jobs.groovy > > > URL: http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/cre > > > ate_ > > > jobs.groovy?rev=1763633&r1=1763632&r2=1763633&view=diff > > > ================================================================= > > > ==== > > > ========= > > > --- sling/trunk/tooling/jenkins/create_jobs.groovy (original) > > > +++ sling/trunk/tooling/jenkins/create_jobs.groovy Thu Oct 6 > > > 17:08:14 2016 > > > @@ -292,7 +292,23 @@ def modules = [ > > > location: 'bundles/scripting/jsp' > > > ], > > > [ > > > - location: 'bundles/scripting/sightly/engine' > > > + location: 'bundles/scripting/sightly/compiler', > > > + downstream: ['bundles/scripting/sightly/java-compiler'] > > > + ], > > > + [ > > > + location: 'bundles/scripting/sightly/java-compiler', > > > + downstream: [ > > > + 'bundles/scripting/sightly/engine', > > > + 'bundles/scripting/sightly/js-use-provider', > > > + 'bundles/scripting/sightly/models-use-provider' > > > + ] > > > + ], > > > + [ > > > + location: 'bundles/scripting/sightly/engine', > > > + downstream: [ > > > + 'bundles/scripting/sightly/testing-content', > > > + 'bundles/scripting/sightly/testing' > > > + ] > > > ], > > > [ > > > location: 'bundles/scripting/sightly/js-use-provider' > > > @@ -304,19 +320,14 @@ def modules = [ > > > location: 'bundles/scripting/sightly/repl' > > > ], > > > [ > > > - location: 'bundles/scripting/sightly/testing-content' > > > + location: 'bundles/scripting/sightly/testing-content', > > > + downstream: ['bundles/scripting/sightly/testing'] > > > ], > > > [ > > > location: 'bundles/scripting/sightly/testing', > > > jdks: ['1.8'] > > > ], > > > [ > > > - location: 'bundles/scripting/sightly/compiler' > > > - ], > > > - [ > > > - location: 'bundles/scripting/sightly/java-compiler' > > > - ], > > > - [ > > > location: 'bundles/servlets/compat' > > > ], > > > [ > > > @@ -606,7 +617,7 @@ def jdkMapping = [ > > > ] > > > > > > modules.each { module -> > > > - > > > + > > > def svnDir = svnBase +"/" + module.location > > > def jdks = module.jdks ?: defaultJdks > > > def deploy = true > > > > > > > > > > > > > > >
