Minor improvements to release notes job

[releng/builder.git] / jjb / releng-templates.yaml

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index bf37c7572e7e3d7203c87b5f749426358e32dced..0971a1f8e3ff81e5a55834c61522c353a0914531 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -15,6 +15,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -64,8 +65,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -79,6 +79,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -114,8 +115,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 # Generic tox-based verify action
 
@@ -123,10 +123,10 @@
     name: tox_builder_verify
 
     # Required Variables:
-    #     stream:    release stream (eg. boron or carbon)
     #     branch:    git branch (eg. stable/boron 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.
 
     project-type: freestyle
     node: '{build-node}'
@@ -138,6 +138,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -153,6 +154,8 @@
             - 'origin/$GERRIT_BRANCH'
           skip-tag: true
           choosing-strategy: 'gerrit'
+          submodule:
+            recursive: true
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -169,9 +172,10 @@
       - shell: |
           virtualenv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse
-          pip freeze
+          PYTHON="$WORKSPACE/venv-tox/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade tox argparse
+          $PYTHON -m pip freeze
           cd $WORKSPACE/repo/{toxdir}
           tox
 
@@ -179,8 +183,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-verify-tox-{stream}'
@@ -196,6 +199,29 @@
     #     toxdir:    directory containing the project's tox.ini relative to
     #                the workspace. Empty works if tox.ini is at project root.
 
+    build-node: centos7-java-builder-2c-4g
+
+    <<: *tox_builder_verify
+
+# Specification for projects outside release cycle, to avoid referring a stream.
+# This is useful mailny for integration-test-jobs, which defines streams for Integration/Distribution,
+# but the tox job is related to Integration/Test only.
+
+- job-template:
+    name: '{project-name}-verify-tox-master'
+
+    # Job template for verify jobs executing tox envlist
+    #
+    # The purpose of this job template is to run tox for projects using this
+    # template.
+    #
+    # Required Variables:
+    #     toxdir:    directory containing the project's tox.ini relative to
+    #                the workspace. Empty works if tox.ini is at project root.
+
+    build-node: centos7-java-builder-2c-4g
+    branch: master
+
     <<: *tox_builder_verify
 
 # Python (pep8) specific, project should migrate to {project-name}-verify-tox-{stream}
@@ -214,6 +240,8 @@
     #     toxdir:    directory containing the project's tox.ini relative to
     #                the workspace. Empty works if tox.ini is at project root.
 
+    build-node: centos7-java-builder-2c-4g
+
     <<: *tox_builder_verify
 
 - job-template:
@@ -226,6 +254,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -249,8 +278,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 # Node related
 
@@ -279,6 +307,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -312,9 +341,10 @@
           # Prepare Python
           virtualenv $WORKSPACE/venv-python
           source $WORKSPACE/venv-python/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse nodeenv
-          pip freeze
+          PYTHON="$WORKSPACE/venv-python/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade tox argparse nodeenv
+          $PYTHON -m pip freeze
 
           # Prepare node
           nodeenv --node={nodever} --prebuilt $WORKSPACE/venv-node
@@ -327,5 +357,4 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish