splitting voltha-sanity-system tests between repos
Change-Id: I966d8fa587c744e559e80e71cd72520e07f13677
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 9ed426c..a87efc1 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -71,6 +71,7 @@
modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0)$'
platform-branches-regexp: '^(master|cord-7.0|cord-6.1)$'
seba-branches-regexp: '^(master|cord-7.0|seba-1.0)$'
+ voltha-stablization-branch: '^(voltha-2.1)$'
# matchs all project repos
all-projects-regexp: '.*'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index b8ce766..42a2c6d 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -10,6 +10,8 @@
branch-regexp: '{all-branches-regexp}'
- 'publish-voltha-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'voltha-go-system-tests':
+ branch-regexp: '{voltha-stablization-branch}'
- job-group:
name: 'verify-voltha-go-jobs'
@@ -37,3 +39,9 @@
build-timeout: 30
docker-repo: 'voltha'
dependency-jobs: 'version-tag'
+
+- job-group:
+ name: 'voltha-go-system-tests'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 008b9de..3f9790d 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,6 +10,8 @@
branch-regexp: '{all-branches-regexp}'
- 'publish-voltha-openolt-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'voltha-openolt-adapter-system-tests':
+ branch-regexp: '{voltha-stablization-branch}'
- job-group:
name: 'verify-voltha-openolt-adapter-jobs'
@@ -38,3 +40,9 @@
build-timeout: 30
docker-repo: 'voltha'
dependency-jobs: 'version-tag'
+
+- job-group:
+ name: 'voltha-openolt-adapter-system-tests'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 0c76132..248cfe9 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -10,6 +10,8 @@
branch-regexp: '{all-branches-regexp}'
- 'publish-voltha-openonu-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'voltha-openonu-adapter-system-tests':
+ branch-regexp: '{voltha-stablization-branch}'
- job-group:
name: 'verify-voltha-openonu-adapter-jobs'
@@ -29,3 +31,9 @@
build-timeout: 30
docker-repo: 'voltha'
dependency-jobs: 'version-tag'
+
+- job-group:
+ name: 'voltha-openonu-adapter-system-tests'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 0829a83..4a3b7c9 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -11,10 +11,6 @@
name: 'voltha-system-tests'
pipeline: 'voltha-go-tests.groovy'
- - 'voltha-patch-test':
- name: 'voltha-bbsim-system-tests'
- pipeline: 'voltha-bbsim-tests.groovy'
-
- job-template:
id: 'voltha-periodic-test'
name: '{name}'
@@ -72,7 +68,7 @@
- job-template:
id: 'voltha-patch-test'
- name: '{name}'
+ name: '{project}_sanity-system-test'
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -148,7 +144,7 @@
triggers:
- cord-infra-gerrit-trigger-patchset:
gerrit-server-name: '{gerrit-server-name}'
- project-regexp: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|)$'
- branch-regexp: '^(voltha-2.1)$'
+ project-regexp: '^{project}$'
+ branch-regexp: '{branch-regexp}'
dependency-jobs: '{dependency-jobs}'
file-include-regexp: '{all-files-regexp}'