summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-merge-jobs.yaml
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-08-24 12:29:52 +0200
committerFatih Degirmenci <fdegir@gmail.com>2018-08-24 14:05:34 +0200
commitaa33ff0331781c277743ab6a1a5260a2b8ad4497 (patch)
treedf2efd3b5a82e07007d841b8258afaa3deb41af5 /jjb/xci/xci-merge-jobs.yaml
parent52f0902934bd495faa2b99380ea175e223626f87 (diff)
xci: Adjust build blockers and fix functest preparation
Functest preparation is moved into the deployment job to ensure things are prepared before we are done and functest job gets triggered. Making the preparation in functest job will cause us to either reinitialize venv or depend on deployment job directory. Apart from that, the env vars necessary for functest are available within deployment job anyways so reusing that will make running functest simpler. See the comments in xci-daily-jobs.yaml builder macros. Change-Id: I4c5bbe5f4b31bb620986d75ba78de6c0fe442975 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci/xci-merge-jobs.yaml')
-rw-r--r--jjb/xci/xci-merge-jobs.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index cb438ad5d..bdb6d5617 100644
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -223,6 +223,7 @@
blocking-jobs:
- 'xci-verify-{distro}-.*'
- 'xci-merge-{distro}-.*'
+ - 'xci-os.*'
- 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'