Tox template for single branch projects

The Int/Test job is converted.
The point is to get rid of
integration-test-verify-tox-boron and similar.

Change-Id: I9b5bfa47e4393dd2701cb6b72446bc8327407c49
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 05475de15590e55fa0134de96cc2363ff886f520..7a4d3fbfaf9bc01b552da0e2051a926030bb7b3a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -3,8 +3,9 @@
     name: integration-test
     project: integration/test
     project-name: integration-test
+    test-branch: master
     jobs:
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-verify-tox-master'
       - 'integration-csit-verify-1node-library'
       - 'integration-distribution-test-{stream}'
       - 'integration-patch-test-{stream}'
@@ -52,8 +53,6 @@
     branch: stable/boron
     scope: only
     jre: openjdk8
-    # Integration/Test branch remains hardcoded to 'master' as int/test does not have any other branch.
-    test-branch: master
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index bf37c7572e7e3d7203c87b5f749426358e32dced..66bdd8b9de1136f47a58029ee4d5de3076cb823a 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -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}'
@@ -198,6 +198,26 @@
 
     <<: *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.
+
+    branch: master
+
+    <<: *tox_builder_verify
+
 # Python (pep8) specific, project should migrate to {project-name}-verify-tox-{stream}
 
 - job-template: