From fa8bdcdb137085d424427e5b037864c8eb6b3034 Mon Sep 17 00:00:00 2001
From: Will Stephenson <wstephenson@suse.de>
Date: Fri, 7 Oct 2016 17:00:07 +0200
Subject: [PATCH] Set env var late prior to @libzypplocked

---
 features/step_definition/helper_steps.rb | 4 ++--
 features/support/env.rb                  | 3 +++
 prophet/.prophet_ci.yml                  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/features/step_definition/helper_steps.rb b/features/step_definition/helper_steps.rb
index 7eb29225..5c13c0d5 100644
--- a/features/step_definition/helper_steps.rb
+++ b/features/step_definition/helper_steps.rb
@@ -12,8 +12,8 @@ def base_product_version
   # base_product_version will fail if libzypp is locked for testing
   # so use env vars if available
   case ENV['PRODUCT']
-  when 'SLE_12'
-    '12-0'
+  when 'SLE_12', 'SLES_12' # for @libzypplocked case
+    '12'
   when 'SLE_12_SP1'
     '12.1'
   when 'SLE_12_SP2'
diff --git a/features/support/env.rb b/features/support/env.rb
index 6bdbeabf..7a76bbe6 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,9 +11,12 @@
 
 Before('@libzypplocked') do
   # this should put the pid of the cucumber process into the lockfile
+  @old_product_env_var_contents = ENV['PRODUCT']
+  ENV['PRODUCT'] = SUSE::Connect::Zypper.base_product.identifier + '_' + SUSE::Connect::Zypper.base_product.version
   `echo $PPID > /var/run/zypp.pid`
 end
 
 After('@libzypplocked') do
   `rm /var/run/zypp.pid`
+  ENV['PRODUCT'] = @old_product_env_var_contents
 end
diff --git a/prophet/.prophet_ci.yml b/prophet/.prophet_ci.yml
index 2231fde1..30261f38 100644
--- a/prophet/.prophet_ci.yml
+++ b/prophet/.prophet_ci.yml
@@ -2,4 +2,4 @@ projects:
 
   connect:
     docker-build-image: cd ..; docker build -t connect .
-    docker-run-tests: cd ..; docker run -e "PRODUCT=SLE_12" --privileged --rm -t connect ./docker/prophet_tests.sh
+    docker-run-tests: cd ..; docker run --privileged --rm -t connect ./docker/prophet_tests.sh