Merge "rearranging nightly testbuilds"
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index f502a6e..8fd539f 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -19,7 +19,7 @@
configurePod: true
# flex pod1 with olt/onu
- - 'build_pod_manual':
+ - 'build_pod_timer':
testvm: 'qa-testvm-pod'
config-pod: 'flex-pod1-olt'
profile: 'att-workflow'
@@ -27,6 +27,7 @@
Jenkinsfile: 'Jenkinsfile-attworkflow-build'
oltDebVersion: 'openolt-master.deb'
configurePod: true
+ time: '4'
# flex pod1 test job
- 'build_pod_test':
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 949c741..6dccbc6 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -181,7 +181,7 @@
triggers:
- timed: |
TZ=America/Los_Angeles
- H {time} {day} * *
+ H {time} * * *
- job-template:
name: 'build_{profile}_{config-pod}_{branch}_test'
diff --git a/jjb/cord-test/rcord-lite.yaml b/jjb/cord-test/rcord-lite.yaml
index b0a91fb..154ddd1 100644
--- a/jjb/cord-test/rcord-lite.yaml
+++ b/jjb/cord-test/rcord-lite.yaml
@@ -9,15 +9,16 @@
build-timeout: '300'
jobs:
- # flex onf pod 1 kubernetes build jobs (rcord lite)
- - 'build_pod_manual':
+ # flex pod1 with olt/onu kubernetes build jobs (rcord lite)
+ - 'build_pod_timer':
testvm: 'qa-testvm-pod'
- config-pod: 'flex-onf-pod1'
+ config-pod: 'flex-pod1-olt'
profile: 'rcord-topdown'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
+ branch: 'cord-6.0'
+ Jenkinsfile: 'Jenkinsfile-rcordlite-topdown'
oltDebVersion: 'openolt-1.4.deb'
configurePod: true
+ time: '20'
# flex pod1 with olt/onu kubernetes build jobs (rcord lite)
- 'build_pod_timer':
@@ -28,32 +29,7 @@
Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch'
oltDebVersion: 'openolt-1.4.deb'
configurePod: true
- time: '0'
- day: '1-31/2'
-
- # flex pod1 with olt/onu kubernetes build jobs (rcord lite)
- - 'build_pod_timer':
- testvm: 'qa-testvm-pod'
- config-pod: 'flex-pod1-olt'
- profile: 'rcord-topdown'
- branch: 'cord-6.0'
- Jenkinsfile: 'Jenkinsfile-rcordlite-topdown'
- oltDebVersion: 'openolt-1.4.deb'
- configurePod: true
- time: '0'
- day: '2-30/2'
-
- # flex pod1 with olt/onu kubernetes master build jobs (rcord lite)
- - 'build_pod_timer':
- testvm: 'qa-testvm-pod'
- config-pod: 'flex-pod1-olt'
- profile: 'rcord-zerotouch'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch-build'
- oltDebVersion: 'openolt-master.deb'
- configurePod: true
- time: '1'
- day: '1-31/2'
+ time: '22'
# flex pod1 with olt/onu kubernetes master build jobs (rcord lite)
- 'build_pod_timer':
@@ -64,8 +40,34 @@
Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
oltDebVersion: 'openolt-master.deb'
configurePod: true
- time: '1'
- day: '2-30/2'
+ time: '0'
+
+ # flex pod1 with olt/onu test job
+ - 'build_pod_test':
+ testvm: 'qa-testvm-pod'
+ config-pod: 'flex-pod1-olt'
+ profile: 'rcord-topdown'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-test'
+
+ # flex pod1 with olt/onu kubernetes master build jobs (rcord lite)
+ - 'build_pod_timer':
+ testvm: 'qa-testvm-pod'
+ config-pod: 'flex-pod1-olt'
+ profile: 'rcord-zerotouch'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch-build'
+ oltDebVersion: 'openolt-master.deb'
+ configurePod: true
+ time: '2'
+
+ # flex pod1 with olt/onu test job
+ - 'build_pod_test':
+ testvm: 'qa-testvm-pod'
+ config-pod: 'flex-pod1-olt'
+ profile: 'rcord-zerotouch'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch-test'
# qct pod1 kubernetes build jobs (rcord lite topdown)
- 'build_pod_timer':
@@ -77,7 +79,6 @@
oltDebVersion: 'openolt-1.4.deb'
configurePod: true
time: '0'
- day: '*'
# qct pod1 test jobs (rcord lite topdown)
- 'build_pod_test':
@@ -87,6 +88,16 @@
branch: 'master'
Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-test'
+ # flex onf pod 1 kubernetes build jobs (rcord lite)
+ - 'build_pod_manual':
+ testvm: 'qa-testvm-pod'
+ config-pod: 'flex-onf-pod1'
+ profile: 'rcord-topdown'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
+ oltDebVersion: 'openolt-master.deb'
+ configurePod: true
+
# flex ocp pod 2 kubernetes build jobs (rcord lite)
- 'build_pod_manual':
testvm: 'flex-pod2'
@@ -94,5 +105,5 @@
profile: 'rcord-topdown'
branch: 'master'
Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
- oltDebVersion: 'openolt-1.4.deb'
+ oltDebVersion: 'openolt-master.deb'
configurePod: true