summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-19 14:28:36 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-03-19 14:28:36 +0100
commit84f1267303358614e0f2d8f9ae18a9a5fb13c513 (patch)
treefc7b8be738a3d7441dddc42545d5d5215531b0a2 /jjb/xci
parent448fdae19653c110b3d784861a7d14717e2c198b (diff)
xci: Enable deployment and testing for post merge jobs
Change-Id: I61fdcf11cc8008bde1c4e26e7b4fd6f16b6e5a78 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/xci-merge-jobs.yml13
1 files changed, 7 insertions, 6 deletions
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'