From 56ba9e90db3800935997f37e805a1b742b524769 Mon Sep 17 00:00:00 2001
From: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date: Thu, 8 Aug 2019 13:03:45 +0200
Subject: [PATCH] Parametrize UpgradeLeappDevelSkip to pass multiple env
 variables.

One of the ways Leapp has to skip some checks is by
passing some environment files when to the leapp
execution environment. Up to now we only tested the
LEAPP_DEVEL_SKIP_RHSM=1 one, however there are many
more. So it makes sense to parametrize this variable
to allow passing a string with all the environment
variables we want to pass to Leapp.

Change-Id: Ic9f4a36cef25150708a71396bea754a93f87661d
---
 .../tripleo-packages-baremetal-puppet.yaml         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 28367d4d82..f898af4bbe 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -59,10 +59,12 @@ parameters:
     description: Print debugging output when running Leapp
     type: boolean
     default: true
-  UpgradeLeappDevelSkipRhsm:
-    description: Skip RHSM when running Leapp in development/testing.
-    type: boolean
-    default: false
+  UpgradeLeappDevelSkip:
+    description: |
+      Skip Leapp checks by setting env variables when running Leapp in
+      development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1.
+    type: string
+    default: ''
   UpgradeLeappRebootTimeout:
     description: Timeout (seconds) for the OS upgrade phase via Leapp
     type: number
@@ -97,7 +99,7 @@ outputs:
           set_fact:
             upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
             upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
-            upgrade_leapp_devel_skip_rhsm: {get_param: UpgradeLeappDevelSkipRhsm}
+            upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
         - name: system_upgrade_prepare step 3
           tags:
@@ -123,7 +125,7 @@ outputs:
               when: upgrade_leapp_enabled
             - name: run leapp upgrade (download packages)
               shell: >
-                {% if upgrade_leapp_devel_skip_rhsm|default(false) %}LEAPP_DEVEL_SKIP_RHSM=1{% endif %}
+                {% if upgrade_leapp_devel_skip|default(false) %}{{ upgrade_leapp_devel_skip }}{% endif %}
                 leapp upgrade
                 {% if upgrade_leapp_debug|default(true) %}--debug{% endif %}
               when: upgrade_leapp_enabled