VOL-2719 Fix job names
Change-Id: Ide962ecdc83e90549bae26e04aa870a010a22b36
diff --git a/jjb/verify/pyvoltha.yaml b/jjb/verify/pyvoltha.yaml
index 968ce91..b8564cb 100644
--- a/jjb/verify/pyvoltha.yaml
+++ b/jjb/verify/pyvoltha.yaml
@@ -11,15 +11,6 @@
- 'publish-pyvoltha-jobs':
branch-regexp: '{all-branches-regexp}'
pypi-index: 'pypi'
-
-- job-group:
- name: 'verify-pyvoltha-jobs'
- jobs:
- - 'verify-licensed'
- - 'tag-collision-reject':
- dependency-jobs: 'verify_pyvoltha_licensed'
- - 'python-unit-test':
- dependency-jobs: 'verify_pyvoltha_tag-collision'
- 'voltha-periodic-test':
name: 'nightly-pyvoltha-compatibility-test'
pipeline-script: 'voltha-bbsim-tests.groovy'
@@ -33,6 +24,16 @@
time-trigger: "@daily"
- job-group:
+ name: 'verify-pyvoltha-jobs'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject':
+ dependency-jobs: 'verify_pyvoltha_licensed'
+ - 'python-unit-test':
+ dependency-jobs: 'verify_pyvoltha_tag-collision'
+
+
+- job-group:
name: 'publish-pyvoltha-jobs'
jobs:
- 'pypi-publish':
diff --git a/jjb/verify/voltha-lib-go.yaml b/jjb/verify/voltha-lib-go.yaml
index cf80f0c..9f148ef 100644
--- a/jjb/verify/voltha-lib-go.yaml
+++ b/jjb/verify/voltha-lib-go.yaml
@@ -8,6 +8,17 @@
jobs:
- 'verify-voltha-lib-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'voltha-periodic-test':
+ name: 'nightly-voltha-lib-go-compatibility-test'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
+ default-image-tag: 'master'
+ code-branch: 'master'
+ make-target: sanity-single-kind
+ gerrit-project: voltha-lib-go
+ onus: 1
+ pons: 1
+ time-trigger: "@daily"
- job-group:
name: 'verify-voltha-lib-go-jobs'
@@ -21,14 +32,3 @@
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
- - 'voltha-periodic-test':
- name: 'nightly-voltha-lib-go-compatibility-test'
- pipeline-script: 'voltha-bbsim-tests.groovy'
- build-node: 'ubuntu16.04-basebuild-4c-8g'
- default-image-tag: 'master'
- code-branch: 'master'
- make-target: sanity-single-kind
- gerrit-project: voltha-lib-go
- onus: 1
- pons: 1
- time-trigger: "@daily"
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 9d475a5..98afdb0 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -12,17 +12,6 @@
branch-regexp: '{all-branches-regexp}'
pypi-index: 'pypi'
pypi-prep-commands: 'make python-protos'
-
-- job-group:
- name: 'verify-voltha-protos-jobs'
- jobs:
- - 'verify-licensed'
- - 'tag-collision-reject':
- - 'make-unit-test':
- build-node: 'ubuntu16.04-basebuild-2c-4g'
- build-timeout: 20
- unit-test-targets: 'test'
- unit-test-keep-going: 'true'
- 'voltha-periodic-test':
name: 'nightly-voltha-protos-compatibility-test'
pipeline-script: 'voltha-bbsim-tests.groovy'
@@ -36,6 +25,17 @@
time-trigger: "@daily"
- job-group:
+ name: 'verify-voltha-protos-jobs'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject':
+ - 'make-unit-test':
+ build-node: 'ubuntu16.04-basebuild-2c-4g'
+ build-timeout: 20
+ unit-test-targets: 'test'
+ unit-test-keep-going: 'true'
+
+- job-group:
name: 'post-merge-voltha-protos-jobs'
jobs:
- 'pypi-publish':