beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject [25/50] [abbrv] beam git commit: [BEAM-2299] Run maven install on Windows machine for build/test coverage on Windows
Date Mon, 24 Jul 2017 04:35:08 GMT
[BEAM-2299] Run maven install on Windows machine for build/test coverage on Windows


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/044d1832
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/044d1832
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/044d1832

Branch: refs/heads/jstorm-runner
Commit: 044d1832f44394f2dc61172d4a2737157a4e2210
Parents: cd91eb2
Author: Luke Cwik <lcwik@google.com>
Authored: Mon May 15 09:40:49 2017 -0700
Committer: Luke Cwik <lcwik@google.com>
Committed: Mon May 15 14:29:56 2017 -0700

----------------------------------------------------------------------
 .../jenkins/common_job_properties.groovy        | 29 +++++++++----
 ..._PostCommit_Java_MavenInstall_Windows.groovy | 45 ++++++++++++++++++++
 sdks/common/runner-api/pom.xml                  |  3 --
 3 files changed, 65 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/044d1832/.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 56eb0de..f47ab28 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -24,14 +24,25 @@ class common_job_properties {
 
   // Sets common top-level job properties for website repository jobs.
   static void setTopLevelWebsiteJobProperties(context) {
-    setTopLevelJobProperties(context, 'beam-site', 'asf-site', 30)
+    setTopLevelJobProperties(
+            context,
+            'beam-site',
+            'asf-site',
+            'beam',
+            30)
   }
 
   // Sets common top-level job properties for main repository jobs.
   static void setTopLevelMainJobProperties(context,
-                                           String defaultBranch = 'master',
-                                           int defaultTimeout = 100) {
-    setTopLevelJobProperties(context, 'beam', defaultBranch, defaultTimeout)
+                                           String branch = 'master',
+                                           int timeout = 100,
+                                           String jenkinsExecutorLabel = 'beam') {
+    setTopLevelJobProperties(
+            context,
+            'beam',
+            branch,
+            jenkinsExecutorLabel,
+            timeout)
   }
 
   // Sets common top-level job properties. Accessed through one of the above
@@ -39,6 +50,7 @@ class common_job_properties {
   private static void setTopLevelJobProperties(context,
                                                String repositoryName,
                                                String defaultBranch,
+                                               String jenkinsExecutorLabel,
                                                int defaultTimeout) {
 
     // GitHub project.
@@ -49,9 +61,8 @@ class common_job_properties {
     // Set JDK version.
     context.jdk('JDK 1.8 (latest)')
 
-    // Restrict this project to run only on Jenkins executors dedicated to the
-    // Apache Beam project.
-    context.label('beam')
+    // Restrict this project to run only on Jenkins executors as specified
+    context.label(jenkinsExecutorLabel)
 
     // Discard old builds. Build records are only kept up to this number of days.
     context.logRotator {
@@ -163,8 +174,8 @@ class common_job_properties {
   }
 
   // Sets common config for Maven jobs.
-  static void setMavenConfig(context) {
-    context.mavenInstallation('Maven 3.3.3')
+  static void setMavenConfig(context, mavenInstallation='Maven 3.3.3') {
+    context.mavenInstallation(mavenInstallation)
     context.mavenOpts('-Dorg.slf4j.simpleLogger.showDateTime=true')
     context.mavenOpts('-Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd\\\'T\\\'HH:mm:ss.SSS')
     // The -XX:+TieredCompilation -XX:TieredStopAtLevel=1 JVM options enable

http://git-wip-us.apache.org/repos/asf/beam/blob/044d1832/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy
new file mode 100644
index 0000000..f781b4e
--- /dev/null
+++ b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy
@@ -0,0 +1,45 @@
+/*
+ * 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 postcommit which runs maven install targeting Jenkins running on Windows.
+mavenJob('beam_PostCommit_Java_MavenInstall_Windows') {
+  description('Runs postcommit tests on Windows for the Java SDK.')
+
+  // Execute concurrent builds if necessary.
+  concurrentBuild()
+
+  // Set common parameters. Note the usage of the Windows label to filter Jenkins executors.
+  common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 100, 'Windows')
+
+  // Set Maven parameters. Note the usage of the Windows Maven installation
+  common_job_properties.setMavenConfig(delegate, 'Maven 3.3.3 (Windows)')
+
+  // Sets that this is a PostCommit job.
+  common_job_properties.setPostCommit(delegate, '0 */6 * * *', false)
+
+  // Allows triggering this build against pull requests.
+  common_job_properties.enablePhraseTriggeringFromPullRequest(
+          delegate,
+          'Java SDK Windows PostCommit Tests',
+          'Run Java Windows PostCommit')
+
+  // Maven goals for this job.
+  goals('-B -e -Prelease,direct-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId
help:effective-settings clean install coveralls:report')
+}

http://git-wip-us.apache.org/repos/asf/beam/blob/044d1832/sdks/common/runner-api/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/common/runner-api/pom.xml b/sdks/common/runner-api/pom.xml
index 3f550bf..f5536a7 100644
--- a/sdks/common/runner-api/pom.xml
+++ b/sdks/common/runner-api/pom.xml
@@ -65,14 +65,11 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <configuration>
           <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-          <pluginId>grpc-java</pluginId>
-          <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
         </configuration>
         <executions>
           <execution>
             <goals>
               <goal>compile</goal>
-              <goal>compile-custom</goal>
             </goals>
           </execution>
         </executions>


Mime
View raw message