Fix path to .kitchen.openstack.yml file for openstack kitchen tests
Related: PROD-26476 (PROD:26476)
Change-Id: I748911a58abd069eb7ae8fbf79b70536825aac8b
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 088a744..6d7e622 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -19,6 +19,7 @@
def checkouted = false
+envOverrides = []
futureFormulas = []
failedFormulas = []
@@ -176,6 +177,7 @@
if (fileExists(".kitchen.yml") || fileExists(".kitchen.openstack.yml")) {
if (fileExists(".kitchen.openstack.yml")) {
common.infoMsg("Openstack Kitchen test configuration found, running Openstack kitchen tests.")
+ envOverrides.add("KITCHEN_YAML=.kitchen.openstack.yml")
if (fileExists(".kitchen.yml")) {
common.infoMsg("Ignoring the docker Kitchen test configuration file.")
}
@@ -191,8 +193,8 @@
common.infoMsg("Override Gemfile found in the kitchen directory, using it.")
ruby.installKitchen()
}
- common.infoMsg = ruby.runKitchenCommand("list -b")
- kitchenEnvs = ruby.runKitchenCommand("list -b").split()
+ common.infoMsg = ruby.runKitchenCommand("list -b", envOverrides.join(' '))
+ kitchenEnvs = ruby.runKitchenCommand("list -b", envOverrides.join(' ')).split()
common.infoMsg(kitchenEnvs)
common.infoMsg("Running kitchen testing in parallel mode")
if (CUSTOM_KITCHEN_ENVS != null && CUSTOM_KITCHEN_ENVS != '') {