Skip to content

Commit

Permalink
Added Groovy DSL definition for C++/Java PR builds (apache#1444)
Browse files Browse the repository at this point in the history
* Added Groovy DSL definition for C++/Java PR builds

* Added license check

* Run PR builds in parallel

* Use "Hadoop" label for Jenkins workers

* Also run integration test concurrently
  • Loading branch information
merlimat authored Mar 26, 2018
1 parent 358bbc2 commit 02fede7
Show file tree
Hide file tree
Showing 5 changed files with 130 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .test-infra/jenkins/common_job_properties.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class common_job_properties {
String branch = 'master',
String jdkVersion = 'JDK 1.8 (latest)',
int timeout = 200,
String jenkinsExecutorLabel = 'ubuntu') {
String jenkinsExecutorLabel = 'Hadoop') {
// GitHub project.
context.properties {
githubProjectUrl('https://github.com/apache/incubator-pulsar/')
Expand Down
67 changes: 67 additions & 0 deletions .test-infra/jenkins/job_pulsar_precommit_cpp.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import common_job_properties

// This is the Java precommit which runs a maven install, and the current set of precommit tests.
freeStyleJob('pulsar_precommit_cpp') {
description('precommit CPP/Python client tests verification for pull requests of <a href="http://pulsar.apache.org">Apache Pulsar</a>.')

// Execute concurrent builds if necessary.
concurrentBuild()

// Set common parameters.
common_job_properties.setTopLevelMainJobProperties(delegate)

// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(delegate, 'C++ / Python Tests')

steps {
// Build Java Code
maven {
// Set Maven parameters.
common_job_properties.setMavenConfig(delegate)

goals('-B clean package')
properties(skipTests: true, interactiveMode: false)
}

shell('''
echo "Build C++ client library"
export CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DBUILD_DYNAMIC_LIB=OFF"
pulsar-client-cpp/docker-build.sh
pulsar-client-cpp/docker-tests.sh
''')
}

publishers {
archiveArtifacts {
allowEmpty(true)
pattern('**/target/container-logs/**')
// archiveJunit doesn't capture everything, so copy these files
pattern('**/surefire-reports/TEST-*.xml')
pattern('**/surefire-reports/*.txt')
// pre and post scripts should output to .debug-info files if needed
pattern('*.debug-info')
}
archiveJunit('**/surefire-reports/TEST-*.xml') {
allowEmptyResults(true)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ freeStyleJob('pulsar_precommit_integrationtests') {
// Set common parameters.
common_job_properties.setTopLevelMainJobProperties(delegate)

// Execute concurrent builds if necessary.
concurrentBuild()

// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(delegate, 'Integration Tests')

Expand Down
58 changes: 58 additions & 0 deletions .test-infra/jenkins/job_pulsar_precommit_java8.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import common_job_properties

// This is the Java precommit which runs a maven install, and the current set of precommit tests.
freeStyleJob('pulsar_precommit_java8') {
description('precommit Java 8 test verification for pull requests of <a href="http://pulsar.apache.org">Apache Pulsar</a>.')

// Execute concurrent builds if necessary.
concurrentBuild()

// Set common parameters.
common_job_properties.setTopLevelMainJobProperties(delegate)

// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(delegate, 'Java 8 - Unit Tests')

steps {
// Build everything
maven {
// Set Maven parameters.
common_job_properties.setMavenConfig(delegate)

goals('-B clean license:check install')
properties(skipTests: false, interactiveMode: false)
}
}

publishers {
archiveArtifacts {
allowEmpty(true)
// archiveJunit doesn't capture everything, so copy these files
pattern('**/surefire-reports/TEST-*.xml')
pattern('**/surefire-reports/*.txt')
// pre and post scripts should output to .debug-info files if needed
pattern('*.debug-info')
}
archiveJunit('**/surefire-reports/TEST-*.xml') {
allowEmptyResults(true)
}
}
}
2 changes: 1 addition & 1 deletion .test-infra/jenkins/job_seed.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import common_job_properties

// Defines the seed job, which creates or updates all other Jenkins projects.
job('pulsar-seed') {
description('Automatically configures all Apache BookKeeper Jenkins projects based' +
description('Automatically configures all Apache Pulsar Jenkins projects based' +
' on Jenkins DSL groovy files checked into the code repository.')

// Set common parameters.
Expand Down

0 comments on commit 02fede7

Please sign in to comment.