From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 29 Jun 2017 22:55:53 +0000 (-0400)
Subject: Expose stream as a env variable
X-Git-Tag: v0.4.2^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F5362%2F3;p=releng%2Fglobal-jjb.git

Expose stream as a env variable

Shell scripts might be interested in using STREAM so let's expose it via
env variable so that they can pick it up. Default all job types to
stream=master.

Change-Id: Ia61d00f88649ef9c01cd6a15cbc248bb4fae1106
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index da8230fb..a221135c 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -87,6 +87,7 @@
     # Default parameters #
     ######################
 
+    stream: master
     branch: master
     submodule-recursive: true
 
@@ -102,6 +103,7 @@
     parameters:
       - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
       - lf-infra-jjb-parameters:
           jjb-version: '{jjb-version}'
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index cb374292..d5cc05b7 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -163,6 +163,13 @@
               Parameter to identify a Gerrit project. This is typically the
               project repo path as exists in Gerrit.
               For example: ofextensions/circuitsw
+      - string:
+          name: STREAM
+          default: '{stream}'
+          description: |
+              Stream is often set to the same name as 'branch' but can
+              sometimes be used as a name representing a project's release code
+              name.
       - string:
           name: GERRIT_PROJECT
           default: '{project}'
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index abaf14ef..3bafab5c 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -56,6 +56,7 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    stream: master
     submodule-recursive: true
 
     #####################
@@ -71,6 +72,7 @@
       - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
+          stream: '{stream}'
       - lf-infra-maven-parameters:
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 4d77d412..e66f522c 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -40,6 +40,7 @@
     branch: master
     build-timeout: 10
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    stream: '{stream}'
     submodule-recursive: true
     tox-dir: ''
     tox-envs: ''
@@ -56,6 +57,7 @@
       - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
+          stream: '{stream}'
       - lf-infra-tox-parameters:
           tox-dir: '{tox-dir}'
           tox-envs: '{tox-envs}'