You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/07/05 16:22:35 UTC
[1/2] beam git commit: This closes #3485
Repository: beam
Updated Branches:
refs/heads/master 14fa7f79f -> f0549b464
This closes #3485
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f0549b46
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f0549b46
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f0549b46
Branch: refs/heads/master
Commit: f0549b464737d0d11ae1da8e0534622b10247208
Parents: 14fa7f7 06897b1
Author: Thomas Groh <tg...@google.com>
Authored: Wed Jul 5 09:22:20 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Wed Jul 5 09:22:20 2017 -0700
----------------------------------------------------------------------
.../jenkins/common_job_properties.groovy | 5 +-
.../job_beam_PreCommit_Website_Merge.groovy | 59 ++++++++++++++++++++
2 files changed, 62 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] beam git commit: Website Mergebot Job
Posted by tg...@apache.org.
Website Mergebot Job
Signed-off-by: Jason Kuster <ja...@google.com>
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/06897b1c
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/06897b1c
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/06897b1c
Branch: refs/heads/master
Commit: 06897b1cc142f658437ac7779c849e5182e331f1
Parents: 14fa7f7
Author: Jason Kuster <ja...@google.com>
Authored: Fri Jun 9 01:39:15 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Wed Jul 5 09:22:20 2017 -0700
----------------------------------------------------------------------
.../jenkins/common_job_properties.groovy | 5 +-
.../job_beam_PreCommit_Website_Merge.groovy | 59 ++++++++++++++++++++
2 files changed, 62 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/06897b1c/.test-infra/jenkins/common_job_properties.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/common_job_properties.groovy b/.test-infra/jenkins/common_job_properties.groovy
index 0e047ea..70534c6 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -23,11 +23,12 @@
class common_job_properties {
// Sets common top-level job properties for website repository jobs.
- static void setTopLevelWebsiteJobProperties(context) {
+ static void setTopLevelWebsiteJobProperties(context,
+ String branch = 'asf-site') {
setTopLevelJobProperties(
context,
'beam-site',
- 'asf-site',
+ branch,
'beam',
30)
}
http://git-wip-us.apache.org/repos/asf/beam/blob/06897b1c/.test-infra/jenkins/job_beam_PreCommit_Website_Merge.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Website_Merge.groovy b/.test-infra/jenkins/job_beam_PreCommit_Website_Merge.groovy
new file mode 100644
index 0000000..0e2ae3f
--- /dev/null
+++ b/.test-infra/jenkins/job_beam_PreCommit_Website_Merge.groovy
@@ -0,0 +1,59 @@
+/*
+ * 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
+
+// Defines a job.
+job('beam_PreCommit_Website_Merge') {
+ description('Runs website tests for mergebot.')
+
+ // Set common parameters.
+ common_job_properties.setTopLevelWebsiteJobProperties(delegate, 'mergebot')
+
+ triggers {
+ githubPush()
+ }
+
+ steps {
+ // Run the following shell script as a build step.
+ shell '''
+ # Install RVM per instructions at https://rvm.io/rvm/install.
+ RVM_GPG_KEY=409B6B1796C275462A1703113804BB82D39DC0E3
+ gpg --keyserver hkp://keys.gnupg.net --recv-keys $RVM_GPG_KEY
+
+ \\curl -sSL https://get.rvm.io | bash
+ source /home/jenkins/.rvm/scripts/rvm
+
+ # Install Ruby.
+ RUBY_VERSION_NUM=2.3.0
+ rvm install ruby $RUBY_VERSION_NUM --autolibs=read-only
+
+ # Install Bundler gem
+ PATH=~/.gem/ruby/$RUBY_VERSION_NUM/bin:$PATH
+ GEM_PATH=~/.gem/ruby/$RUBY_VERSION_NUM/:$GEM_PATH
+ gem install bundler --user-install
+
+ # Install all needed gems.
+ bundle install --path ~/.gem/
+
+ # Build the new site and test it.
+ rm -fr ./content/
+ bundle exec rake test
+ '''.stripIndent().trim()
+ }
+}