summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-verify-jobs.yml
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-02-26 11:11:10 +0000
committerFatih Degirmenci <fdegir@gmail.com>2018-02-26 11:15:06 +0000
commit90f5aa7749149fb0fc1a886133e3e761404330fc (patch)
tree69bac373f5cd0a47d6f1218100e2dabfbc2b1420 /jjb/xci/xci-verify-jobs.yml
parent004edc2cdfa1aaf77dd5ed1bcb5f7344849d5531 (diff)
xci: Fix extracting scenarios for generic scenarios
Change-Id: Ib58ff1a8b093af550f86d337327114df50da4ae7 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci/xci-verify-jobs.yml')
-rw-r--r--jjb/xci/xci-verify-jobs.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 6877ecc25..40e9ee388 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -135,6 +135,9 @@
name: SLAVE_LABEL
default: 'xci-virtual'
- string:
+ name: DISTRO
+ default: '{distro}'
+ - string:
name: CLEAN_DIB_IMAGES
default: 'true'
- string:
@@ -145,7 +148,7 @@
builders:
- 'xci-verify-set-scenario-macro'
- inject:
- properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/scenario.properties"
+ properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
- description-setter:
description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME"
- multijob:
@@ -238,7 +241,7 @@
wrappers:
- inject:
- properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/scenario.properties"
+ properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
- ssh-agent-wrapper
- build-timeout:
timeout: 240