Adding support to test multiple branches in the ONOS Apps tests
Change-Id: I43641c74e35e7a5adf03fbf188d2571bfd79d5d6
diff --git a/jjb/verify/aaa.yaml b/jjb/verify/aaa.yaml
index 438dd3e..d834f06 100644
--- a/jjb/verify/aaa.yaml
+++ b/jjb/verify/aaa.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'aaa-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!aaa-1\.10).*)$'
- 'aaa-jobs-legacy':
branch-regexp: '^(aaa-1.10)$'
diff --git a/jjb/verify/dhcpl2relay.yaml b/jjb/verify/dhcpl2relay.yaml
index ef1d849..c24ee84 100644
--- a/jjb/verify/dhcpl2relay.yaml
+++ b/jjb/verify/dhcpl2relay.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'dhcpl2relay-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!dhcpl2relay-1\.6).*)$'
- 'dhcpl2relay-jobs-legacy':
branch-regexp: '^(dhcpl2relay-1.6)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/igmp.yaml b/jjb/verify/igmp.yaml
index 143d8c4..759b1ef 100644
--- a/jjb/verify/igmp.yaml
+++ b/jjb/verify/igmp.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'igmp-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!igmp-1\.4).*)$'
- 'igmp-jobs-legacy':
branch-regexp: '^(igmp-1.4)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/kafka-onos.yaml b/jjb/verify/kafka-onos.yaml
index d9fffe5..9f32a00 100644
--- a/jjb/verify/kafka-onos.yaml
+++ b/jjb/verify/kafka-onos.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'kafka-onos-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!kafka-onos-1\..).*)$'
junit-allow-empty-results: true
- 'kafka-onos-jobs-legacy':
diff --git a/jjb/verify/mcast.yaml b/jjb/verify/mcast.yaml
index a79f955..5c5a07d 100644
--- a/jjb/verify/mcast.yaml
+++ b/jjb/verify/mcast.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'mcast-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!mcast-1\.4).*)$'
junit-allow-empty-results: true
- 'mcast-jobs-legacy':
@@ -36,4 +36,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/olt.yaml b/jjb/verify/olt.yaml
index a654a96..f2fb650 100644
--- a/jjb/verify/olt.yaml
+++ b/jjb/verify/olt.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'olt-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!olt-3\.0).*)$'
- 'olt-jobs-legacy':
branch-regexp: '^(olt-3.0)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-
diff --git a/jjb/verify/sadis.yaml b/jjb/verify/sadis.yaml
index fe700d0..536909a 100644
--- a/jjb/verify/sadis.yaml
+++ b/jjb/verify/sadis.yaml
@@ -10,7 +10,7 @@
branch-regexp: '^(.*)$'
- 'sadis-jobs':
- branch-regexp: '^(master)$'
+ branch-regexp: '^((?!sadis-3\.1).*)$'
- 'sadis-jobs-legacy':
branch-regexp: '^(sadis-3.1)$'
@@ -34,4 +34,3 @@
jobs:
- 'maven-test'
- 'maven-publish'
-