summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-merge-jobs.yml
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-19 15:18:34 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-03-19 15:21:04 +0100
commit08132a0641f00818410e70028c980bc924cd7d98 (patch)
tree84763673f198b6b53ff5555e83fc9b9d3b17e8c3 /jjb/xci/xci-merge-jobs.yml
parentc825697ac7f5afac76354faac6421e60c9827e10 (diff)
xci: Fix envInject and remove scenario distro support check
envInject doesn't play well with variable expansion so it is fixed. [1] Scenario support check is not necessary for promotion since the promotion job is common for all scenarios/distros and check is done as part of earlier distro jobs accordingly. [2] gsutil upload is also made quiet. Fixed version can be seen from [3]. [1] https://build.opnfv.org/ci/job/xci-merge-promote-virtual-master/2/console [2] https://build.opnfv.org/ci/job/xci-merge-promote-virtual-master/4/console [3] https://build.opnfv.org/ci/job/xci-merge-promote-virtual-master/5/console Change-Id: Ie36394cab631826209dda4cea6daa456aca3c276 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci/xci-merge-jobs.yml')
-rw-r--r--jjb/xci/xci-merge-jobs.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index c9788c3d9..64da14d66 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -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