VOL-5156 - Disable job build_flex-ocp-cord_TP_TT_voltha*

jjb/voltha-test/voltha-release-jobs/master.yaml
jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
jjb/voltha-test/voltha.yaml
makefiles/jjb/targets.mk
----------------------------------------------------
  o Refactor voltha.yaml into configs named for release branches.
  o Disable jobs hanging on 'qa-testvm-pod'

Change-Id: I3d497aa05fd31db3acfe97bcc645b28ff76b9c0c
diff --git a/jjb/voltha-test/voltha-release-jobs/master.yaml b/jjb/voltha-test/voltha-release-jobs/master.yaml
index 8c461ae..67908c0 100644
--- a/jjb/voltha-test/voltha-release-jobs/master.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/master.yaml
@@ -46,7 +46,7 @@
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           branch: 'master'
-          release: 'master'
+          release: 'master' 
           profile: '1T4GEM'
           time: '1'
           VolthaEtcdPort: 9999
@@ -61,8 +61,8 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
-#          branch: 'master'
-#          release: 'master'
+          #branch: 'master'
+          #release: 'master'
           disable-job: true              # menlo-demo-pod offline
           name-extension: '_DT'
           work-flow: 'DT'
@@ -94,4 +94,43 @@
           VolthaEtcdPort: 9999
           time: '1'
 
+      # -----------------------------------------------------------------------
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # md5sum(master): 07b501ef13e00b5aeaf808ca534ba276
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          disable-job: true              # Reason: qa-test-vm offline
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '10'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+
+      # -----------------------------------------------------------------------
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # ec22ad3751cbb83e0cff505eaebe9f6f
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-multi-uni'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '16'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          reinstall-olt: true
+          enableMultiUni: true
+          uniPortMask: '0x0003'
+          
 # [EOF]
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 c5d609d..fecba63 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
@@ -55,6 +55,10 @@
           num-of-atomix: '3'
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
+      # -----------------------------------------------------------------------
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # md5sum(master): 07b501ef13e00b5aeaf808ca534ba276
+      # -----------------------------------------------------------------------
       - 'build_voltha_pod_release_timer':
           disable-job: true               # Reason: qa-testvm-pod offline
           build-node: 'qa-testvm-pod'
@@ -107,5 +111,26 @@
           waitTimerForOltUp: 540
           VolthaEtcdPort: 9999
           time: '1'
-          
+
+      # -----------------------------------------------------------------------
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # ec22ad3751cbb83e0cff505eaebe9f6f
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-multi-uni'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '16'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          reinstall-olt: true
+          enableMultiUni: true
+          uniPortMask: '0x0003'
+
 # [EOF]
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 0952a9c..e659ac6 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
@@ -28,7 +28,9 @@
     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'
@@ -40,8 +42,10 @@
           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
           build-node: 'qa-testvm-pod'
@@ -58,6 +62,7 @@
       # -----------------------------------------------------------------------
       # [VOL-4939] - flex OCP pod with olt/onu
       #            - Released versions Default tech profile and timer based job
+      # md5sum(master): 07b501ef13e00b5aeaf808ca534ba276
       # -----------------------------------------------------------------------
       - 'build_voltha_pod_release_timer':
           disable-job: true                   # Reason: qa-testvm-pod offline
@@ -112,4 +117,25 @@
           VolthaEtcdPort: 9999
           time: '1'
 
+      # -----------------------------------------------------------------------
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # ec22ad3751cbb83e0cff505eaebe9f6f
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-multi-uni'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '16'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          reinstall-olt: true
+          enableMultiUni: true
+          uniPortMask: '0x0003'
+          
 # [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 0e58156..b59b58e 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -92,21 +92,6 @@
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM'
 
-      # flex OCP pod with olt/onu - Released versions 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: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '10'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           disable-job: false
@@ -167,25 +152,6 @@
           test-repo: 'voltha-system-tests'
           profile: 'TP'
 
-      # -----------------------------------------------------------------------
-      # [CORD-4941] - flex OCP pod with olt/onu - Released versions 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-multi-uni'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '16'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          reinstall-olt: true
-          enableMultiUni: true
-          uniPortMask: '0x0003'
-
       # [CORD-4941] - flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           disable-job: true
diff --git a/makefiles/jjb/targets.mk b/makefiles/jjb/targets.mk
index 889eceb..9778337 100644
--- a/makefiles/jjb/targets.mk
+++ b/makefiles/jjb/targets.mk
@@ -23,6 +23,7 @@
 ##---]  GLOBALS  [---##
 ##-------------------##
 jjb-gen-dir := build
+# JJB_DEBUG := true
 
 ##-------------------##
 ##---]  TARGETS  [---##
@@ -34,14 +35,18 @@
 ## -----------------------------------------------------------------------
 .PHONY: jjb-gen
 
+jjb-gen-args := $(null)
+$(if $(JJB_DEBUG),$(eval jjb-gen-args += --log_level DEBUG))
+
 jjb-gen-log := $(jjb-gen-dir)/jjb-gen.log
 jjb-gen: $(venv-activate-script)
+
 	$(call banner-enter,Target $@)
 	@mkdir -p $(jjb-gen-dir)
 	@touch "$(jjb-gen-dir)/.sentinel"
 	( \
 	  $(activate) \
-	     && jenkins-jobs test $(PWD)/jjb -o $(jjb-gen-dir) 3>&1 2>&1 \
+	     && jenkins-jobs $(jjb-gen-args) test $(PWD)/jjb -o $(jjb-gen-dir) 3>&1 2>&1 \
 	) | tee "$(jjb-gen-log)"
 
   ifdef LOGS