[5033] - Clone build_voltha_pod_release_timer to run on a release branch
jjb/voltha-test/voltha.yaml
jjb/voltha-test/voltha-bat/*
jjb/voltha-test/voltha-bat/master.yaml
jjb/voltha-test/voltha-bat/voltha-2.12.yaml
-------------------------------------------
o Refactor job definition build_voltha_pod_release_timer
o into a versioned hierarchy to support release job branching.
makefiles/release/help.mk
makefiles/release/targets.mk
makefiles/release/targets/voltha-bat.mk
---------------------------------------
o Add new release makefile targets for maintaining the
o new refactored job pipelines extracted from voltha.yaml.
Change-Id: Ic0f1079a4ed9ef1ff201bb24e5ef6b4dbfd077f4
diff --git a/jjb/voltha-test/voltha-release-jobs/master.yaml b/jjb/voltha-test/voltha-release-jobs/master.yaml
index 5a14850..4ebe5c2 100644
--- a/jjb/voltha-test/voltha-release-jobs/master.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/master.yaml
@@ -29,6 +29,17 @@
num-of-ponports: ''
jobs:
+ # flex OCP pod with olt/onu - Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ disable-job: false
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ profile: 'Default'
+ time: '5'
+ VolthaEtcdPort: 9999
+ num-of-onos: '3'
+ num-of-atomix: '3'
+
# [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
- 'build_voltha_pod_release_timer':
disable-job: true
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
index cded815..b7fdbd9 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
@@ -28,6 +28,19 @@
num-of-ponports: ''
jobs:
+ # flex OCP pod with olt/onu - Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ disable-job: false
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.11'
+ branch: 'voltha-2.11'
+ profile: 'Default'
+ time: '5'
+ VolthaEtcdPort: 9999
+ num-of-onos: '3'
+ num-of-atomix: '3'
+
# [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
- 'build_voltha_pod_release_timer':
disable-job: true
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
index dd30f22..260494a 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
@@ -28,6 +28,19 @@
num-of-ponports: ''
jobs:
+ # flex OCP pod with olt/onu - Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ disable-job: false
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.12'
+ branch: 'voltha-2.12'
+ profile: 'Default'
+ time: '5'
+ VolthaEtcdPort: 9999
+ num-of-onos: '3'
+ num-of-atomix: '3'
+
# [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
- 'build_voltha_pod_release_timer':
disable-job: true
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
index cf4a57b..062bd21 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
@@ -28,6 +28,19 @@
num-of-ponports: ''
jobs:
+ # flex OCP pod with olt/onu - Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ disable-job: true
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.8'
+ branch: 'voltha-2.8'
+ profile: 'Default'
+ time: '5'
+ VolthaEtcdPort: 9999
+ num-of-onos: '3'
+ num-of-atomix: '3'
+
# [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
- 'build_voltha_pod_release_timer':
disable-job: true
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 8b8c70f..30791ed 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -56,17 +56,6 @@
test-repo: 'voltha-system-tests'
pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
- # flex OCP pod with olt/onu - Default tech profile and timer based job
- - 'build_voltha_pod_release_timer':
- disable-job: false
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- profile: 'Default'
- time: '5'
- VolthaEtcdPort: 9999
- num-of-onos: '3'
- num-of-atomix: '3'
-# ZZ
# flex pod1 test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
disable-job: false
diff --git a/makefiles/release/help.mk b/makefiles/release/help.mk
index 0358ed8..72af6be 100644
--- a/makefiles/release/help.mk
+++ b/makefiles/release/help.mk
@@ -24,6 +24,7 @@
@echo
@echo '[RELEASE] - Create branch driven testing pipelines'
@echo ' create-jobs-release'
+ @echo ' create-jobs-release-bat Build and test jobs'
@echo ' create-jobs-release-e2e End-to-End testing'
@echo ' create-jobs-release-certification Certification testing'
@echo ' create-jobs-release-nightly Nightly testing'
diff --git a/makefiles/release/targets.mk b/makefiles/release/targets.mk
index 5ed307c..ea2988a 100644
--- a/makefiles/release/targets.mk
+++ b/makefiles/release/targets.mk
@@ -49,6 +49,7 @@
## ---------------------------------------------------------------------------
## Intent: Build these deps to create a new branch/release area
## ---------------------------------------------------------------------------
+create-jobs-release += create-jobs-release-bat
create-jobs-release += create-jobs-release-certification
create-jobs-release += create-jobs-release-nightly
create-jobs-release += create-jobs-release-units