benchmark-runner 1.0.767__tar.gz → 1.0.768__tar.gz

{benchmark_runner-1.0.767/benchmark_runner.egg-info → benchmark_runner-1.0.768}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.767
+Version: 1.0.768
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.767 → benchmark_runner-1.0.768}/benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -28,6 +28,8 @@ class BareMetalOperations:
         self._ocp_env_flavor = self._environment_variables_dict.get('ocp_env_flavor', '')
         self._create_pod_ci_cmd = self._environment_variables_dict.get('create_pod_ci_cmd', '')
         self._install_ocp_version = self._environment_variables_dict.get('install_ocp_version', '')
+        self._ocp_build = self._environment_variables_dict.get('ocp_build', '')
+        self._installer_var_path = self._environment_variables_dict.get('installer_var_path', '')
         self._cluster_type = self._environment_variables_dict.get('cluster_type', '')
         self._expected_nodes = self._environment_variables_dict.get('expected_nodes', '')
         if self._expected_nodes:
@@ -197,14 +199,22 @@ class BareMetalOperations:
         if self.LATEST in self._install_ocp_version:
             self._install_ocp_version = self._get_installation_version()
         openshift_version_data = self._install_ocp_version.split('.')
-        self._remote_ssh.replace_parameter(remote_path='/root/jetlag/ansible/vars',
+        self._remote_ssh.replace_parameter(remote_path=self._installer_var_path,
                                             file_name=file_name,
                                             parameter='ocp_release_image:',
                                             value=fr'quay.io\/openshift-release-dev\/ocp-release:{self._install_ocp_version}-x86_64')
-        self._remote_ssh.replace_parameter(remote_path='/root/jetlag/ansible/vars',
+        self._remote_ssh.replace_parameter(remote_path=self._installer_var_path,
                                             file_name=file_name,
                                             parameter='openshift_version:',
                                             value=f'"{openshift_version_data[0]}.{openshift_version_data[1]}"')
+        self._remote_ssh.replace_parameter(remote_path=self._installer_var_path,
+                                            file_name=file_name,
+                                            parameter='ocp_version:',
+                                            value=f'"{openshift_version_data[0]}.{openshift_version_data[1]}"')
+        self._remote_ssh.replace_parameter(remote_path=self._installer_var_path,
+                                            file_name=file_name,
+                                            parameter='ocp_build:',
+                                            value=f'"{self._ocp_build}"')
 
     def update_provision_config(self):
         """

{benchmark_runner-1.0.767 → benchmark_runner-1.0.768}/benchmark_runner/main/environment_variables.py

@@ -224,6 +224,8 @@ class EnvironmentVariables:
         self._environment_variables_dict['install_ocp_version'] = EnvironmentVariables.get_env('INSTALL_OCP_VERSION', '')
         # There are 4 options: run_bare_metal_ocp_installer/ verify_bare_metal_install_complete/ run_ibm_ocp_installer/ verify_ibm_install_complete
         self._environment_variables_dict['install_step'] = EnvironmentVariables.get_env('INSTALL_STEP', '')
+        # ga/dev/ci, default ga
+        self._environment_variables_dict['ocp_build'] = EnvironmentVariables.get_env('OCP_BUILD', 'ga')
 
         # MANDATORY for OCP upgrade: Specify the version as '4.15.22'. Ensure that the upgrade version is stable by checking: https://github.com/openshift/cincinnati-graph-data/tree/master/channels )
         self._environment_variables_dict['upgrade_ocp_version'] = EnvironmentVariables.get_env('UPGRADE_OCP_VERSION','')
@@ -286,6 +288,7 @@ class EnvironmentVariables:
         self._environment_variables_dict['provision_installer_path'] = EnvironmentVariables.get_env(f'PROVISION_INSTALLER_PATH', '')
         self._environment_variables_dict['provision_installer_cmd'] = EnvironmentVariables.get_env(f'PROVISION_INSTALLER_CMD', '')
         self._environment_variables_dict['provision_installer_log'] = EnvironmentVariables.get_env(f'PROVISION_INSTALLER_LOG', '')
+        self._environment_variables_dict['installer_var_path'] = EnvironmentVariables.get_env(f'INSTALLER_VAR_PATH', '')
 
         # timeout 0<=: forever, >0: second (installer)
         self._environment_variables_dict['provision_timeout'] = EnvironmentVariables.get_env(f'PROVISION_TIMEOUT', '10800')

{benchmark_runner-1.0.767 → benchmark_runner-1.0.768/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.767
+Version: 1.0.768
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.767 → benchmark_runner-1.0.768}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.767'  # update also .bumpversion.cfg
+__version__ = '1.0.768'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))