From: Fatih Degirmenci <fdegir@gmail.com>
Date: Mon, 19 Mar 2018 13:28:36 +0000 (+0100)
Subject: xci: Enable deployment and testing for post merge jobs
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=84f1267303358614e0f2d8f9ae18a9a5fb13c513;p=releng.git

xci: Enable deployment and testing for post merge jobs

Change-Id: I61fdcf11cc8008bde1c4e26e7b4fd6f16b6e5a78
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index c9788c3d9..b44066245 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -384,16 +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'