Merge "Fix typo in deploy file builder loop"

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index da8230f..a221135 100644 (file)
--- 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 cb37429..d5cc05b 100644 (file)
--- 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 afefd4c..3bafab5 100644 (file)
--- 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}'
@@ -123,7 +125,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
-          choosing-strategy: gerrit
+          choosing-strategy: default
 
 - job-template:
     name: '{project-name}-maven-release-{stream}'

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 4d77d41..e66f522 100644 (file)
--- 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}'

diff --git a/shell/git-validate-jira-urls.sh b/shell/git-validate-jira-urls.sh
index d44fec9..51d5132 100644 (file)
--- a/shell/git-validate-jira-urls.sh
+++ b/shell/git-validate-jira-urls.sh
@@ -15,7 +15,7 @@
 set -e -o pipefail
 set +u
 
-JIRA_LINK=$(git rev-list --format=%B --max-count=1 HEAD | grep -io 'http[s]*://jira\..*')
+JIRA_LINK=$(git rev-list --format=%B --max-count=1 HEAD | grep -io 'http[s]*://jira\..*' || true)
 if [[ ! -z "$JIRA_LINK" ]]
 then
   echo 'Remove JIRA URLs from commit message'