X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates.yaml;h=18ae3c723e36de9743ddf47eba4d51776baf8775;hb=1fbd0789241b9d3fc894751453a3940153b29402;hp=0971a1f8e3ff81e5a55834c61522c353a0914531;hpb=d51b349beb2eab289500e77f4387acdd408d300e;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 0971a1f8e..18ae3c723 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -42,7 +42,7 @@
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'autorelease-settings'
       - maven-target:
           maven-version: 'mvn33'
@@ -57,7 +57,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-stage-release
 
@@ -96,7 +96,7 @@
       - releng-fetch-p2zip-if-necessary:
           maven-version: 'mvn33'
           settings: '{mvn-settings}'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
       - releng-generate-p2pom
       - maven-target:
           maven-version: 'mvn33'
@@ -104,12 +104,12 @@
           goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-update-p2composite-metadata:
           maven-version: 'mvn33'
           settings: '{mvn-settings}'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
 
     publishers:
       - email-notification:
@@ -123,7 +123,7 @@
     name: tox_builder_verify
 
     # Required Variables:
-    #     branch:    git branch (eg. stable/boron or master)
+    #     branch:    git branch (eg. stable/nitrogen or master)
     #     toxdir:    directory containing the project's tox.ini relative to
     #                the workspace. Empty works if tox.ini is at project root.
     # Note that stream value is not needed.
@@ -175,7 +175,8 @@
           PYTHON="$WORKSPACE/venv-tox/bin/python"
           $PYTHON -m pip install --upgrade pip
           $PYTHON -m pip install --upgrade tox argparse
-          $PYTHON -m pip freeze
+          $PYTHON -m pip install --upgrade pipdeptree
+          pipdeptree
           cd $WORKSPACE/repo/{toxdir}
           tox
 
@@ -292,8 +293,8 @@
     # virtualenv for nodejs.
     #
     # Required Variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
+    #     stream:    release stream (eg. nitrogen or oxygen)
+    #     branch:    git branch (eg. stable/nitrogen or master)
     #     nodedir:   directory of nodejs project to run node test against
     #     nodever:   version of node to install in virtualenv
 
@@ -344,7 +345,8 @@
           PYTHON="$WORKSPACE/venv-python/bin/python"
           $PYTHON -m pip install --upgrade pip
           $PYTHON -m pip install --upgrade tox argparse nodeenv
-          $PYTHON -m pip freeze
+          $PYTHON -m pip install --upgrade pipdeptree
+          pipdeptree
 
           # Prepare node
           nodeenv --node={nodever} --prebuilt $WORKSPACE/venv-node