Fix macros uniqueness

Macro names need to be uniquely defined otherwise JJB cannot
differentiate between types of macros. Renaming netvirt and ovsdb run-it
macros to be more unique.

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

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index f79bb7b06388ca8591c2982af362b28927a4fe2e..42791179b72692a5d4ae079bf99086f8c53acebc 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -21,7 +21,7 @@
     archive-artifacts: '*.log'
 
 - builder:
-    name: run-it
+    name: netvirt-run-it
     builders:
         - maven-target:
             maven-version: '{maven-version}'
@@ -44,7 +44,7 @@
 - builder:
     name: run-net-virt-it
     builders:
-        - run-it:
+        - netvirt-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'openstack/net-virt-it/pom.xml'
@@ -53,7 +53,7 @@
 - builder:
     name: run-netvirt-sfc-it
     builders:
-        - run-it:
+        - netvirt-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'openstack/net-virt-sfc/it/pom.xml'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 863c55435717589e1d39d654631fea674472ae10..5ef05ad31703198733e66450bbee25d4930f50aa 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -26,7 +26,7 @@
     archive-artifacts: '*.log'
 
 - builder:
-    name: run-it
+    name: ovsdb-run-it
     builders:
         - maven-target:
             maven-version: '{maven-version}'
@@ -49,7 +49,7 @@
 - builder:
     name: run-library-it
     builders:
-        - run-it:
+        - ovsdb-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'library/it/pom.xml'
@@ -58,7 +58,7 @@
 - builder:
     name: run-southbound-it
     builders:
-        - run-it:
+        - ovsdb-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'southbound/southbound-it/pom.xml'
@@ -67,7 +67,7 @@
 - builder:
     name: run-hwvtepsouthbound-it
     builders:
-        - run-it:
+        - ovsdb-run-it:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'