[beam] 02/04: Make the snapshot and url parameters to the job to allow installing a different version

[lc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 1c30f40731006001b1ea1215e048f67e037194a2
Author: Alan Myrvold <al...@comcast.net>
AuthorDate: Mon Dec 18 20:32:05 2017 +0000

    Make the snapshot and url parameters to the job to allow installing a different version
---
 .../jenkins/job_beam_PostRelease_NightlySnapshot.groovy     | 13 ++++++++++++-
 release/TestHelper.groovy                                   |  3 ++-
 release/quickstart-java-direct.groovy                       |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.test-infra/jenkins/job_beam_PostRelease_NightlySnapshot.groovy b/.test-infra/jenkins/job_beam_PostRelease_NightlySnapshot.groovy
index 57fa631..5c1f7cc 100644
--- a/.test-infra/jenkins/job_beam_PostRelease_NightlySnapshot.groovy
+++ b/.test-infra/jenkins/job_beam_PostRelease_NightlySnapshot.groovy
@@ -29,6 +29,17 @@ job('beam_PostRelease_NightlySnapshot') {
   // Set common parameters.
   common_job_properties.setTopLevelMainJobProperties(delegate)
 
+  parameters {
+    stringParam('snapshot_version',
+                '2.3.0-SNAPSHOT',
+                'Version of the repository snapshot to install')
+    stringParam('snapshot_url',
+                'https://repository.apache.org/content/repositories/snapshots',
+                'Repository URL to install from')
+  }
+
+  wrappers {
+
   // This is a post-commit job that runs once per day, not for every push.
   common_job_properties.setPostCommit(
       delegate,
@@ -38,6 +49,6 @@ job('beam_PostRelease_NightlySnapshot') {
 
   steps {
     // Run a quickstart from https://beam.apache.org/get-started/quickstart-java/
-    shell('cd ' + common_job_properties.checkoutDir + '/release && groovy quickstart-java-direct.groovy')
+    shell('cd ' + common_job_properties.checkoutDir + '/release && groovy quickstart-java-direct.groovy ')
   }
 }
diff --git a/release/TestHelper.groovy b/release/TestHelper.groovy
index 2a44791..893bf82 100644
--- a/release/TestHelper.groovy
+++ b/release/TestHelper.groovy
@@ -110,6 +110,7 @@ class TestHelper {
      def m2 = new File(var.startDir, ".m2/repository")
      m2.mkdirs()
      def settings = new File(var.startDir, "settings.xml")
+     def repo = System.env.snapshot_repository ?: "https://repository.apache.org/content/repositories/snapshots"
      settings.write """
        <settings>
          <localRepository>${m2.absolutePath}</localRepository>
@@ -119,7 +120,7 @@ class TestHelper {
                  <repositories>
                    <repository>
                      <id>apache.snapshots</id>
-                     <url>https://repository.apache.org/content/repositories/snapshots</url>
+                     <url>${repo}</url>
                    </repository>
                  </repositories>
                </profile>
diff --git a/release/quickstart-java-direct.groovy b/release/quickstart-java-direct.groovy
index e00ae2e..64ae33a 100644
--- a/release/quickstart-java-direct.groovy
+++ b/release/quickstart-java-direct.groovy
@@ -26,7 +26,7 @@ t = new TestHelper()
 t.describe 'Run Apache Beam Java SDK Quickstart - Direct'
 
   t.it 'Gets the WordCount Code'
-    ver = "2.3.0-SNAPSHOT"
+    ver = System.env.snapshot_version ?: "2.3.0-SNAPSHOT"
 
     // Generate a maven project from the snapshot repository
     t.run """mvn archetype:generate \

-- 
To stop receiving notification emails like this one, please contact
lcwik@apache.org.