From bbdff1b1679ece6e985c787b93f213b7bae23ad9 Mon Sep 17 00:00:00 2001 From: Alan Myrvold Date: Thu, 27 Sep 2018 08:37:44 -0700 Subject: [PATCH] [BEAM-4496] Fix #2 branch fetch failure on job_PostCommit_Website_Publish --- .test-infra/jenkins/job_PostCommit_Website_Publish.groovy | 2 +- website/build.gradle | 5 +++-- website/src/get-started/downloads.md | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy b/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy index 669a84abcfee..0396be9f2489 100644 --- a/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy +++ b/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy @@ -21,7 +21,7 @@ import PostcommitJobBuilder // This job builds and publishes the website into the asf-site branch of the beam repo. -PostcommitJobBuilder.postCommitJob('beam_PostCommit_Website_Publish', '', +PostcommitJobBuilder.postCommitJob('beam_PostCommit_Website_Publish', 'Run Website Publish', 'Website Publish', this) { description('Publish generated website content into asf-site branch for hosting.') diff --git a/website/build.gradle b/website/build.gradle index a73628d0184d..dd0436cf65cb 100644 --- a/website/build.gradle +++ b/website/build.gradle @@ -28,6 +28,7 @@ def buildDir = "${project.rootDir}/build/website" def buildContentDir = "${project.rootDir}/build/website/generated-content" def repoContentDir = "${project.rootDir}/website/generated-content" def commitedChanges = false +def gitboxUrl = "https://gitbox.apache.org/repos/asf/beam.git" def shell = { cmd -> println cmd @@ -125,7 +126,7 @@ task commitWebsite << { // get the latest commit on master def latestCommit = grgit.log(maxCommits: 1)[0].abbreviatedId - shell "git fetch origin asf-site" + shell "git fetch ${gitboxUrl} asf-site" git.checkout(branch: 'asf-site') shell "git reset --hard origin/asf-site" @@ -178,7 +179,7 @@ task publishWebsite << { } // Because git.push() fails to authenticate, run git push directly. - shell "git push https://gitbox.apache.org/repos/asf/beam.git asf-site" + shell "git push ${gitboxUrl} asf-site" } commitWebsite.dependsOn testWebsite diff --git a/website/src/get-started/downloads.md b/website/src/get-started/downloads.md index d9912472f4d5..608774f98128 100644 --- a/website/src/get-started/downloads.md +++ b/website/src/get-started/downloads.md @@ -80,9 +80,9 @@ versions denoted `0.x.y`. ## Releases ### 2.6.0 (2018-08-08) -Official [source code download](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip) -[SHA-512](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip.sha512) -[signature](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip.asc). +Official [source code download](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip) +[SHA-512](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip.sha512) +[signature](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip.asc). [Release notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319527&version=12343392).