Repository: beam Updated Branches: refs/heads/master 929a23e29 -> dee8e93e7
Split Java and Python precommit jobs Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/25790a4f Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/25790a4f Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/25790a4f Branch: refs/heads/master Commit: 25790a4fdbe59ac5b1d5e19cce8ec3620be08183 Parents: 9379ca2 Author: Kenneth Knowles <k...@google.com> Authored: Tue Oct 3 10:06:27 2017 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Wed Oct 4 14:08:07 2017 -0700 ---------------------------------------------------------------------- .../job_beam_PreCommit_Java_MavenInstall.groovy | 21 ++++++-- ...ob_beam_PreCommit_Python_MavenInstall.groovy | 56 ++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/25790a4f/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy index f4ebcaf..dad3726 100644 --- a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy +++ b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy @@ -38,8 +38,21 @@ mavenJob('beam_PreCommit_Java_MavenInstall') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PreCommit job. - common_job_properties.setPreCommit(delegate, 'Maven clean install') - - // Maven goals for this job. - goals('-B -e -Prelease,include-runners,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report') + common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/java/core -am -amd') + + // Maven goals for this job: The Java SDK, its dependencies, and things that depend on it. + goals('''\ + --batch-mode \ + --errors \ + --activate-profiles release,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner \ + --projects sdks/java/core \ + --also-make \ + --also-make-dependents \ + -D repoToken=$COVERALLS_REPO_TOKEN \ + -D pullRequest=$ghprbPullId \ + help:effective-settings \ + clean \ + install \ + coveralls:report \ + ''') } http://git-wip-us.apache.org/repos/asf/beam/blob/25790a4f/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy new file mode 100644 index 0000000..19a4b21 --- /dev/null +++ b/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy @@ -0,0 +1,56 @@ +/* + * 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. +mavenJob('beam_PreCommit_Python_MavenInstall') { + description('Runs an install of the current GitHub Pull Request.') + + previousNames('beam_PreCommit_MavenVerify') + + // Execute concurrent builds if necessary. + concurrentBuild() + + // Set common parameters. + common_job_properties.setTopLevelMainJobProperties( + delegate, + 'master', + 150) + + // Set Maven parameters. + common_job_properties.setMavenConfig(delegate) + + // Sets that this is a PreCommit job. + common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/python -am -amd') + + // Maven goals for this job: The Python SDK, its dependencies, and things that depend on it. + goals('''\ + --batch-mode \ + --errors \ + --activate-profiles release,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner \ + --projects sdks/python \ + --also-make \ + --also-make-dependents \ + -D pullRequest=$ghprbPullId \ + help:effective-settings \ + clean \ + install + ''') +}