summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-19 14:57:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-19 14:57:07 +0000
commit36464933ed4ccd7336b1ae315ca1b5d1f9a82527 (patch)
treede01562aba358b9505ca600c442b50f8a1bf2414 /jjb/xci
parent08132a0641f00818410e70028c980bc924cd7d98 (diff)
parent84f1267303358614e0f2d8f9ae18a9a5fb13c513 (diff)
Merge "xci: Enable deployment and testing for post merge jobs"
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 64da14d66..a986aa5c2 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'