From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 10 Aug 2017 03:43:41 +0000 (-0400)
Subject: Fix python-tox incorrect default stream setting
X-Git-Tag: v0.7.0~16
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=aac734585a5302a26a33ea34f03d0b66c96ed7f0;p=releng%2Fglobal-jjb.git

Fix python-tox incorrect default stream setting

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

diff --git a/jjb-test/expected-xml/gerrit-python-tox-verify-{stream} b/jjb-test/expected-xml/gerrit-python-tox-verify-master
similarity index 99%
rename from jjb-test/expected-xml/gerrit-python-tox-verify-{stream}
rename to jjb-test/expected-xml/gerrit-python-tox-verify-master
index 2284a3c3..9e8ebf17 100644
--- a/jjb-test/expected-xml/gerrit-python-tox-verify-{stream}
+++ b/jjb-test/expected-xml/gerrit-python-tox-verify-master
@@ -33,7 +33,7 @@ For example: ofextensions/circuitsw
 sometimes be used as a name representing a project's release code
 name.
 </description>
-          <defaultValue>{stream}</defaultValue>
+          <defaultValue>master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>GERRIT_PROJECT</name>
diff --git a/jjb-test/expected-xml/github-python-tox-verify-{stream} b/jjb-test/expected-xml/github-python-tox-verify-master
similarity index 99%
rename from jjb-test/expected-xml/github-python-tox-verify-{stream}
rename to jjb-test/expected-xml/github-python-tox-verify-master
index af531186..c18a8cd4 100644
--- a/jjb-test/expected-xml/github-python-tox-verify-{stream}
+++ b/jjb-test/expected-xml/github-python-tox-verify-master
@@ -28,7 +28,7 @@ For example: ofextensions/circuitsw
 sometimes be used as a name representing a project's release code
 name.
 </description>
-          <defaultValue>{stream}</defaultValue>
+          <defaultValue>master</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>GERRIT_PROJECT</name>
diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index e66f522c..74ce9df9 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -40,7 +40,7 @@
     branch: master
     build-timeout: 10
     git-url: '$GIT_URL/$GERRIT_PROJECT'
-    stream: '{stream}'
+    stream: master
     submodule-recursive: true
     tox-dir: ''
     tox-envs: ''