Merge "Downloading voltctl in the bin folder If testing a voltctl patch replace the executable with the freshly built one"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 157b607..22cf9a7 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -477,7 +477,7 @@
           time-trigger: "H H */3 * *"
 
       # Berlin pod with olt/onu - master versions timer based job , two OLTs
-      - 'build_voltha_pod_release_timer':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-multi-olt'
           release: 'master'
@@ -491,7 +491,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
-          time: '21'
+          trigger-after: build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.6_test
 
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
@@ -508,7 +508,7 @@
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with olt/onu -  voltha-2.6 timer based job , two OLTs
-      - 'build_voltha_pod_release_timer':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-multi-olt'
           release: '2.6'
@@ -522,7 +522,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
-          time: '13'
+          trigger-after: build_dt-berlin-pod-multi-olt_1T8GEM_voltha_DT_master_test
 
 
       # Berlin POD test job -  voltha-2.6 versions: two OLTs
@@ -539,7 +539,7 @@
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
      # Berlin pod with olt/onu - voltha-2.6 Default tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
           release: '2.6'
@@ -552,7 +552,7 @@
           configurePod: true
           disable-job: true
           profile: 'Default'
-          time: '17'
+          trigger-after: build_dt-berlin-pod-multi-olt_1T8GEM_voltha_DT_2.6_test
 
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
@@ -566,7 +566,7 @@
           power-switch: True
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
           release: 'master'
@@ -580,7 +580,8 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
-          time: '1'
+          #update this to use 'build_dt-berlin-pod_Default_voltha_2.6_test' once above job enables
+          trigger-after: build_dt-berlin-pod-multi-olt_1T8GEM_voltha_DT_2.6_test
 
 
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -597,7 +598,7 @@
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with adtran gpon olt/onu - master 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon-adtran'
           release: '2.6'
@@ -613,7 +614,7 @@
           profile: '1T8GEM'
           reinstall-olt: false
           openoltAdapterChart: '/home/community/adtran-2021-01-29/voltha-adapter-adtran-olt'
-          time: '9'
+          trigger-after: build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_master_test
 
 
       # Berlin POD adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -631,7 +632,7 @@
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
      # Berlin pod with gpon olt/onu - voltha-2.5 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
           release: '2.6'
@@ -645,7 +646,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
-          time: '5'
+          trigger-after: build_dt-berlin-pod-gpon-adtran_1T8GEM_voltha_DT_2.6_test
 
 
       # Berlin POD test job - voltha-2.5 versions: uses 1T8GEM tech profile on voltha branch
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a4466e0..92251b2 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -229,7 +229,7 @@
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-att-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
-          'disable-job': false
+          'disable-job': true
           time-trigger: "H H/4 * * *"
           withMonitoring: false
           logLevel: WARN
@@ -248,7 +248,7 @@
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-dt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
-          'disable-job': false
+          'disable-job': true
           time-trigger: "H H/4 * * *"
           withMonitoring: false
           logLevel: WARN
@@ -267,7 +267,7 @@
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-tt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
-          'disable-job': false
+          'disable-job': true
           time-trigger: "H H/4 * * *"
           withMonitoring: false
           logLevel: WARN
@@ -362,7 +362,7 @@
           name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-att-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
-          'disable-job': false
+          'disable-job': true
           time-trigger: "H H/4 * * *"
           withMonitoring: false
           logLevel: WARN
@@ -382,7 +382,7 @@
           name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-dt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
-          'disable-job': false
+          'disable-job': true
           time-trigger: "H H/4 * * *"
           withMonitoring: false
           logLevel: WARN
@@ -402,7 +402,7 @@
           name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-tt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
-          'disable-job': false
+          'disable-job': true
           time-trigger: "H H/4 * * *"
           withMonitoring: false
           logLevel: WARN
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 2b8a04e..c59ea1a 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -205,6 +205,12 @@
       - reverse:
           jobs: '{trigger-after}'
           result: 'success'
+      - reverse:
+          jobs: '{trigger-after}'
+          result: 'failure'
+      - reverse:
+          jobs: '{trigger-after}'
+          result: 'unstable'
 
 # VOLTHA Test Job
 # This job is automatically triggered after a build job has successfully completed