[ https://issues.apache.org/jira/browse/BEAM-3257?focusedWorklogId=88578&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88578 ]
ASF GitHub Bot logged work on BEAM-3257: ---------------------------------------- Author: ASF GitHub Bot Created on: 06/Apr/18 19:29 Start Date: 06/Apr/18 19:29 Worklog Time Spent: 10m Work Description: lukecwik closed pull request #5045: [BEAM-3257] Migrate JUnit test archiving to Python Gradle build URL: https://github.com/apache/beam/pull/5045 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.test-infra/jenkins/job_beam_PreCommit_Python_GradleBuild.groovy b/.test-infra/jenkins/job_beam_PreCommit_Python_GradleBuild.groovy index d2fdef72ad3..255277d471a 100644 --- a/.test-infra/jenkins/job_beam_PreCommit_Python_GradleBuild.groovy +++ b/.test-infra/jenkins/job_beam_PreCommit_Python_GradleBuild.groovy @@ -41,6 +41,12 @@ job('beam_PreCommit_Python_GradleBuild') { '--rerun-tasks', ] + // Publish all test results to Jenkins. Note that Nose documentation + // specifically mentions that it produces JUnit compatible test results. + publishers { + archiveJunit('**/nosetests.xml') + } + def gradle_command_line = './gradlew ' + gradle_switches.join(' ') + ' :pythonPreCommit' // Sets that this is a PreCommit job. common_job_properties.setPreCommit(delegate, gradle_command_line, 'Run Python Gradle PreCommit') diff --git a/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy deleted file mode 100644 index f0429e4aa18..00000000000 --- a/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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 Python 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', 'Run Python PreCommit') - - // Maven modules for this job: The Python SDK, its dependencies, and things that depend on it, - // excluding the container. - goals([ - '--batch-mode', - '--errors', - '--activate-profiles release', - '--projects sdks/python,!sdks/python/container', - '--also-make', - '--also-make-dependents', - '-D pullRequest=$ghprbPullId', - 'help:effective-settings', - 'clean', - 'install', - ].join(' ')) -} diff --git a/sdks/python/setup.cfg b/sdks/python/setup.cfg index 0f6acea2c09..041d6fa55f4 100644 --- a/sdks/python/setup.cfg +++ b/sdks/python/setup.cfg @@ -26,6 +26,9 @@ verbosity=2 # fast_coders_test and typecoders_test. exclude=fast_coders_test|typecoders_test +# Creates an xml file compatible with standard XUnit XML format. +with-xunit=1 + # Configurations to control coverage.py. [coverage:run] branch = True diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini index ff88ac42fa8..3cc16823684 100644 --- a/sdks/python/tox.ini +++ b/sdks/python/tox.ini @@ -50,7 +50,7 @@ commands = pip --version {toxinidir}/run_tox_cleanup.sh python apache_beam/examples/complete/autocomplete_test.py - python setup.py test + python setup.py nosetests {toxinidir}/run_tox_cleanup.sh [testenv:py27-cython] @@ -64,7 +64,7 @@ commands = pip --version {toxinidir}/run_tox_cleanup.sh python apache_beam/examples/complete/autocomplete_test.py - python setup.py test + python setup.py nosetests {toxinidir}/run_tox_cleanup.sh [testenv:py27-gcp] @@ -74,7 +74,7 @@ commands = pip --version {toxinidir}/run_tox_cleanup.sh python apache_beam/examples/complete/autocomplete_test.py - python setup.py test + python setup.py nosetests {toxinidir}/run_tox_cleanup.sh [testenv:py27-lint] ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 88578) Time Spent: 4h 10m (was: 4h) > Migrate Python Jenkins PreCommits to Gradle > ------------------------------------------- > > Key: BEAM-3257 > URL: https://issues.apache.org/jira/browse/BEAM-3257 > Project: Beam > Issue Type: Sub-task > Components: build-system, testing > Reporter: Luke Cwik > Assignee: Udi Meiri > Priority: Major > Time Spent: 4h 10m > Remaining Estimate: 0h > > Code is here: > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy -- This message was sent by Atlassian JIRA (v7.6.3#76005)