Merge "KVMFORNFV: Uploading logs to artifacts for debugging."

diff --combined jjb/kvmfornfv/kvmfornfv.yml
index 157f2dc,9857f6a..522e971
--- 1/jjb/kvmfornfv/kvmfornfv.yml
--- 2/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@@ -57,6 -57,7 +57,6 @@@
      parameters:
          - project-parameter:
              project: '{project}'
 -        - gerrit-parameter:
              branch: '{branch}'
          - 'opnfv-build-ubuntu-defaults'
  
@@@ -90,7 -91,7 +90,7 @@@
                  - name: 'kvmfornfv-verify-build-{stream}'
                    current-parameters: false
                    predefined-parameters: |
 -                    GERRIT_BRANCH=$GERRIT_BRANCH
 +                    BRANCH=$BRANCH
                      GERRIT_REFSPEC=$GERRIT_REFSPEC
                      GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                    node-parameters: false
@@@ -103,7 -104,7 +103,7 @@@
                  - name: 'kvmfornfv-verify-test-{stream}'
                    current-parameters: false
                    predefined-parameters: |
 -                    GERRIT_BRANCH=$GERRIT_BRANCH
 +                    BRANCH=$BRANCH
                      GERRIT_REFSPEC=$GERRIT_REFSPEC
                      GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                    node-parameters: false
@@@ -127,6 -128,7 +127,6 @@@
      parameters:
          - project-parameter:
              project: '{project}'
 -        - gerrit-parameter:
              branch: '{branch}'
          - '{slave-label}-defaults'
          - 'kvmfornfv-defaults':
@@@ -145,6 -147,7 +145,6 @@@
      parameters:
          - project-parameter:
              project: '{project}'
 -        - gerrit-parameter:
              branch: '{branch}'
          - 'opnfv-build-ubuntu-defaults'
          - 'kvmfornfv-defaults':
@@@ -183,6 -186,7 +183,6 @@@
      parameters:
          - project-parameter:
              project: '{project}'
 -        - gerrit-parameter:
              branch: '{branch}'
          - 'opnfv-build-ubuntu-defaults'
          - 'kvmfornfv-defaults':
@@@ -256,6 -260,7 +256,6 @@@
      parameters:
          - project-parameter:
              project: '{project}'
 -        - gerrit-parameter:
              branch: '{branch}'
          - '{slave-label}-defaults'
          - 'kvmfornfv-defaults':
@@@ -264,6 -269,10 +264,10 @@@
              name: TEST_NAME
              default: '{testname}'
              description: "Daily job to execute kvmfornfv '{testname}' testcase."
+         - string:
+             name: PHASE
+             default: '{phase}'
+             description: "Execution of kvmfornfv daily '{phase}' job ."
  
      builders:
          - description-setter:
@@@ -300,6 -309,8 +304,8 @@@
              !include-raw: ./kvmfornfv-download-artifact.sh
          - shell:
              !include-raw: ./kvmfornfv-test.sh
+         - shell:
+             !include-raw: ./kvmfornfv-upload-artifact.sh
  - builder:
      name: 'kvmfornfv-packet_forward-daily-build-macro'
      builders: