From 90f5aa7749149fb0fc1a886133e3e761404330fc Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Mon, 26 Feb 2018 11:11:10 +0000
Subject: xci: Fix extracting scenarios for generic scenarios

Change-Id: Ib58ff1a8b093af550f86d337327114df50da4ae7
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---
 jjb/xci/xci-verify-jobs.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'jjb/xci/xci-verify-jobs.yml')

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
@@ -134,6 +134,9 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+      - string:
+          name: DISTRO
+          default: '{distro}'
       - string:
           name: CLEAN_DIB_IMAGES
           default: 'true'
@@ -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
-- 
cgit 1.2.3-korg