Merge "Disable jobs dependent on offline menlo-3 node"
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index 19eb4b5..5beb4fc 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -86,17 +86,6 @@
           power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
-      # Certification (Radisys) pod with olt/onu - master versions timer based job (ZZ)
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          reinstall-olt: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '1'
-          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
-
       # -----------------------------------------------------------------------
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
       # -----------------------------------------------------------------------
diff --git a/jjb/voltha-test/voltha-certification/master.yaml b/jjb/voltha-test/voltha-certification/master.yaml
index 817193b..9aa344f 100644
--- a/jjb/voltha-test/voltha-certification/master.yaml
+++ b/jjb/voltha-test/voltha-certification/master.yaml
@@ -47,4 +47,21 @@
           power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) pod with olt/onu - master versions timer based job
+      # md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-3'
+          config-pod: 'menlo-certification-pod-radisys-3200g'
+          disable-job: true              # Reason: menlo-certification-pod-3 is offline
+          release: 'master'
+          branch: 'master'
+          reinstall-olt: true
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '1'
+          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
+
 # [EOF]
diff --git a/jjb/voltha-test/voltha-certification/voltha-2.11.yaml b/jjb/voltha-test/voltha-certification/voltha-2.11.yaml
index fd7d342..03ce24f 100644
--- a/jjb/voltha-test/voltha-certification/voltha-2.11.yaml
+++ b/jjb/voltha-test/voltha-certification/voltha-2.11.yaml
@@ -45,21 +45,6 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
 
-      # Certification (Radisys) pod with olt/onu - 2.11 version timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: true       # menlo-certification-pod-3: offline
-          reinstall-olt: true
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '9'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.tag=master"
-
       - 'build_voltha_pod_release_timer':
           build-node: 'menlo-certification-pod-1'
           config-pod: 'menlo-certification-pod-radisys-1600g'
@@ -92,4 +77,37 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
 
+      # Certification (Radisys) pod with olt/onu - 2.11 version timer based job
+      # Duplicate(?) of -- md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'menlo-certification-pod-3'
+#          config-pod: 'menlo-certification-pod-radisys-3200g'
+#          disable-job: true       # menlo-certification-pod-3: offline
+#          reinstall-olt: true
+#          release: '2.11'
+#          branch: 'voltha-2.11'
+#          name-extension: '_DT'
+#          work-flow: 'DT'
+#          profile: '1T8GEM'
+#          time: '9'
+#          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+#          extraHelmFlags: "--set onos-classic.image.tag=master"
+
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) pod with olt/onu - master versions timer based job
+      # md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-3'
+          config-pod: 'menlo-certification-pod-radisys-3200g'
+          disable-job: true              # Reason: menlo-certification-pod-3 is offline
+          release: '2.11'
+          branch: 'voltha-2.11'
+          reinstall-olt: true
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '1'
+          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
+
 # [EOF]
diff --git a/jjb/voltha-test/voltha-certification/voltha-2.12.yaml b/jjb/voltha-test/voltha-certification/voltha-2.12.yaml
index 59320d3..b750532 100644
--- a/jjb/voltha-test/voltha-certification/voltha-2.12.yaml
+++ b/jjb/voltha-test/voltha-certification/voltha-2.12.yaml
@@ -45,21 +45,6 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
       
-      # Certification (Radisys) pod with olt/onu - 2.12 version timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: true
-          reinstall-olt: true
-          release: '2.12'
-          branch: 'voltha-2.12'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '9'
-          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.tag=master"
-
       # -----------------------------------------------------------------------
       # Certification (Radisys) pod with olt/onu - 2.11 version timer based job
       # -----------------------------------------------------------------------
@@ -95,4 +80,37 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
 
+      # Certification (Radisys) pod with olt/onu - 2.12 version timer based job
+      # Duplicate(?) of -- md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'menlo-certification-pod-3'
+#          config-pod: 'menlo-certification-pod-radisys-3200g'
+#          disable-job: true
+#          reinstall-olt: true
+#          release: '2.12'
+#          branch: 'voltha-2.12'
+#          name-extension: '_DT'
+#          work-flow: 'DT'
+#          profile: '1T8GEM'
+#          time: '9'
+#          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+#          extraHelmFlags: "--set onos-classic.image.tag=master"
+          
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) pod with olt/onu - master versions timer based job
+      # md5sum(master): 2ea4de8fab54538915bcf95ab08c8430 
+     # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-3'
+          config-pod: 'menlo-certification-pod-radisys-3200g'
+          disable-job: true              # Reason: menlo-certification-pod-3 is offline
+          release: '2.12'
+          branch: 'voltha-2.12'
+          reinstall-olt: true
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '1'
+          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
+
 # [EOF]
diff --git a/jjb/voltha-test/voltha-certification/voltha-2.8.yaml b/jjb/voltha-test/voltha-certification/voltha-2.8.yaml
index e327388..08cca79 100644
--- a/jjb/voltha-test/voltha-certification/voltha-2.8.yaml
+++ b/jjb/voltha-test/voltha-certification/voltha-2.8.yaml
@@ -86,5 +86,5 @@
           profile: '1T8GEM'
           power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-         
+
 # [EOF]