Fix Gerrit project path for meta projects

- Rename PROJECT to PROJECT_SHORTNAME
- Add PROJECT_PATH representing full Gerrit path
- Update Project class to support a path attribute

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

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 6c92aa34e1f87a1a9ba6ba4000ebba80cdc5e9bf..21a5111cfaca1a8f0ada140c98949e7e2f3e9b25 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-clm-{stream}'
+    name: 'PROJECT_SHORTNAME-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
@@ -43,8 +43,8 @@
 
     postbuilders:
         - check-clm:
-            application-name: PROJECT
+            application-name: PROJECT_SHORTNAME
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index df0f0af96f619c240d27edb865b029eb1ed00f8b..ca13f8adde7965f30d4b917a438a5dfcb42f0bdf 100644 (file)
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-daily-{stream}'
+    name: 'PROJECT_SHORTNAME-daily-{stream}'
 
     # Job template for daily builders
     #
@@ -56,5 +56,5 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index fb2ed0517eb34ac92ff565d9ee9e9381b3cee574..4a9398c2da8caa7be5f27be86464676b29622e4d 100644 (file)
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-distribution-{stream}'
+    name: 'PROJECT_SHORTNAME-distribution-{stream}'
 
     # Required variables:
     #     stream:    release stream (eg. stable-lithium or beryllium)

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 7e7c1ab9afc0a0960b00fda6d12ba198df4dab3f..20127aad670e588ae1420ae0bca38344a419e2b9 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-integration-{stream}'
+    name: 'PROJECT_SHORTNAME-integration-{stream}'
     disabled: DISABLED
 
     # Job template for ODL integration verify jobs

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 2061221d2a5c0adf4eda9bdac1cb58a7c5fe9404..bae96fa14e42933e6b5e23ed37424ecf5e0420d5 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-merge-{stream}'
+    name: 'PROJECT_SHORTNAME-merge-{stream}'
 
     # Job template for ODL merge jobs
     #
@@ -38,7 +38,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
-            name: 'PROJECT'
+            name: 'PROJECT_PATH'
             branch: '{branch}'
 
     prebuilders:
@@ -59,7 +59,7 @@
     publishers:
         ARCHIVE_ARTIFACTS
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - maven-deploy:
             id: ''
             unique-version: true

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index 0cb05d8b1c24cd7a2aef5dedbb63834f6a8274ce..ebb7d9d0ac0f3deb8f9509fd18a2e80310f487c8 100644 (file)
--- a/jjb-templates/project.yaml
+++ b/jjb-templates/project.yaml
@@ -4,16 +4,17 @@
 
 # ODL Releng build templates
 - project:
-    name: PROJECT
+    name: PROJECT_SHORTNAME
     jobs:
 JOB_TEMPLATES
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     STREAMS
-    project: 'PROJECT'
+    project: 'PROJECT_PATH'
 
 # For the Job templates below replace instances of:
-# PROJECT with your project name (eg. controller)
+# PROJECT_SHORTNAME with your project name (eg. circuitsw)
+# PROJECT_PATH with your project name (eg. ofextensions/circuitsw)
 # MAVEN_GOALS with your maven goals to build
 # MAVEN_OPTS with your maven options to build

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index d2faa26555c05d84bfef6a07dd7b0177d61fdfe9..b5f2243d93e4a056a013a5275cc51fea55fa32ab 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-sonar'
+    name: 'PROJECT_SHORTNAME-sonar'
 
     project-type: maven
     node: dynamic_verify
@@ -30,7 +30,7 @@
     triggers:
         - timed: 'H H * * *'
         - gerrit-trigger-patch-sonar:
-            name: 'PROJECT'
+            name: 'PROJECT_PATH'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -52,5 +52,5 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 0c551d9e9ebcf38135c5bc36f37e7b801fc53d62..7b01f1d4c6fed8d4dfcedae1d21997399cea5399 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-verify-{stream}'
+    name: 'PROJECT_SHORTNAME-verify-{stream}'
 
     # Job template for ODL verify jobs
     #
@@ -49,7 +49,7 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
-            name: 'PROJECT'
+            name: 'PROJECT_PATH'
             branch: '{branch}'
 
     builders:
@@ -67,5 +67,5 @@
     publishers:
         - findbugs
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index f9273c88a5235dda6df1cead779249a8db5436a4..dfb20299e406d23026e87370769e339bab665462 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -191,7 +191,8 @@ with open(project_file, "w") as outfile:
             for line in infile:
                 if not re.match("\s*#", line):
                     line = re.sub("JOB_TEMPLATES", job_templates_yaml, line)
-                    line = re.sub("PROJECT", project.project, line)
+                    line = re.sub("PROJECT_SHORTNAME", project.project, line)
+                    line = re.sub("PROJECT_PATH", project.path, line)
                     line = re.sub("JENKINS_SETTINGS", jenkins_settings, line)
                     line = re.sub("DISABLED", disabled, line)
                     line = re.sub("STREAMS", str_streams, line)

diff --git a/scripts/jjblib.py b/scripts/jjblib.py
index 51cf9c046dde1e441c622722adeeb6115d7ff954..254246fe29413a9404885b3269f49de21e5ad2e4 100644 (file)
--- a/scripts/jjblib.py
+++ b/scripts/jjblib.py
@@ -78,7 +78,16 @@ def create_template_config(project_dir, args):
 
 
 class Project:
+    """Represents a Gerrit Project
+
+    Attributes:
+        path(str): The full Gerrit path to a project
+        meta_project(str): The top-level project name in Gerrit
+        project(str): The subproject name or project shortname
+    """
+
     def __init__(self, project):
+        self.path = project
         self.meta_project = None
         self.project = project