[ https://issues.apache.org/jira/browse/BEAM-5717?focusedWorklogId=153643&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-153643 ]
ASF GitHub Bot logged work on BEAM-5717: ---------------------------------------- Author: ASF GitHub Bot Created on: 11/Oct/18 18:44 Start Date: 11/Oct/18 18:44 Worklog Time Spent: 10m Work Description: swegner closed pull request #6655: [BEAM-5717] Only pass PR ID to Gradle if available URL: https://github.com/apache/beam/pull/6655 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/PrecommitJobBuilder.groovy b/.test-infra/jenkins/PrecommitJobBuilder.groovy index 0b8147150e1..af0ef837c53 100644 --- a/.test-infra/jenkins/PrecommitJobBuilder.groovy +++ b/.test-infra/jenkins/PrecommitJobBuilder.groovy @@ -103,11 +103,13 @@ class PrecommitJobBuilder { rootBuildScriptDir(commonJobProperties.checkoutDir) tasks(gradleTask) commonJobProperties.setGradleSwitches(delegate) - switches('-PgithubPullRequestId=${ghprbPullId}') - if (nameBase == 'Java') { + if (scope.binding.hasVariable('ghprbPullId')) { + switches('-PgithubPullRequestId=${ghprbPullId}') + } + if (nameBase == 'Java') { // BEAM-5035: Parallel builds are very flaky switches('--no-parallel') - } + } } } } diff --git a/website/build.gradle b/website/build.gradle index 3c41c141ef1..dd75099ab08 100644 --- a/website/build.gradle +++ b/website/build.gradle @@ -136,7 +136,7 @@ createBuildTask( name:'Gcs', useTestConfig: true, baseUrl: getBaseUrl(), dockerW createBuildTask( name:'Apache', dockerWorkDir: dockerWorkDir) def getBaseUrl() { - project.findProperty('githubPullRequestId') ?: 'latest' + project.findProperty('githubPullRequestId')?.trim() ?: 'latest' } def buildContentDir(name) { "${project.rootDir}/build/website/generated-${name.toLowerCase()}-content" ---------------------------------------------------------------- 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: 153643) Time Spent: 3h 20m (was: 3h 10m) > [beam_PreCommit_Website_Stage_GCS_Cron] [stageWebsite] 404 The destination > bucket gs://apache-beam-website-pull-requests does not exist or the write to > the destination must be restarted > ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- > > Key: BEAM-5717 > URL: https://issues.apache.org/jira/browse/BEAM-5717 > Project: Beam > Issue Type: Bug > Components: test-failures > Reporter: Scott Wegner > Assignee: Scott Wegner > Priority: Major > Labels: currently-failing > Time Spent: 3h 20m > Remaining Estimate: 0h > > _Use this form to file an issue for test failure:_ > * [Jenkins > Job|https://builds.apache.org/job/beam_PreCommit_Website_Stage_GCS_Cron/28/] > * [Gradle Build > Scan|https://scans.gradle.com/s/3a7ujky4ekojw/console-log?task=:beam-website:stageWebsite#L4610] > * [Test source > code|https://github.com/apache/beam/blob/280277e7788b4c28680dd8ca02d54a55195b24ba/website/build.gradle#L271] > Initial investigation: > I haven't seen this issue before; it's not clear if this is a persistent > failure or a flake. I will investigate further. > ---- > _After you've filled out the above details, please [assign the issue to an > individual|https://beam.apache.org/contribute/postcommits-guides/index.html#find_specialist]. > Assignee should [treat test failures as > high-priority|https://beam.apache.org/contribute/postcommits-policies/#assigned-failing-test], > helping to fix the issue or find a more appropriate owner. See [Apache Beam > Post-Commit > Policies|https://beam.apache.org/contribute/postcommits-policies]._ -- This message was sent by Atlassian JIRA (v7.6.3#76005)