Merge "xci: Enable deployment and testing for post merge jobs"

diff --combined jjb/xci/xci-merge-jobs.yml
index 64da14d,b440662..a986aa5
--- 1/jjb/xci/xci-merge-jobs.yml
--- 2/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@@ -361,7 -361,7 +361,7 @@@
  
      wrappers:
        - inject:
 -          properties-file: "$LOCAL_PROMOTION_METADATA_FILE"
 +          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
        - ssh-agent-wrapper
        - build-timeout:
            timeout: 240
@@@ -384,16 -384,17 +384,17 @@@
  - builder:
      name: 'xci-merge-deploy-macro'
      builders:
-       - shell: |
-           #!/bin/bash
-           echo "Hello World"
+       - shell:
+           !include-raw: ./xci-start-new-vm.sh
+ 
+       - shell:
+           !include-raw: ./xci-start-deployment.sh
  
  - builder:
      name: 'xci-merge-healthcheck-macro'
      builders:
-       - shell: |
-           #!/bin/bash
-           echo "Hello World"
+       - shell:
+           !include-raw: ./xci-run-functest.sh
  
  - builder:
      name: 'xci-merge-promote-macro'