benchmark-runner 1.0.843__tar.gz → 1.0.845__tar.gz

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845}/MANIFEST.in

@@ -34,8 +34,8 @@ include benchmark_runner/common/ocp_resources/cnv/template/*.sh
 include benchmark_runner/common/ocp_resources/cnv/template/*.yaml
 include benchmark_runner/common/ocp_resources/custom/template/*.sh
 include benchmark_runner/common/ocp_resources/custom/template/*.yaml
-include benchmark_runner/common/ocp_resources/nhc_snr/template/*.sh
-include benchmark_runner/common/ocp_resources/nhc_snr/template/*.yaml
+include benchmark_runner/common/ocp_resources/nhc_far/template/*.sh
+include benchmark_runner/common/ocp_resources/nhc_far/template/*.yaml
 
 # ocp assisted installer (jetlag)
 include benchmark_runner/common/assisted_installer/jetlag/run_jetlag.sh

{benchmark_runner-1.0.843/benchmark_runner.egg-info → benchmark_runner-1.0.845}/PKG-INFO

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

benchmark_runner-1.0.843/benchmark_runner/common/ocp_resources/create_nhc_snr.py → benchmark_runner-1.0.845/benchmark_runner/common/ocp_resources/create_nhc_far.py

@@ -6,9 +6,9 @@ from benchmark_runner.common.logger.logger_time_stamp import logger_time_stamp,
 from benchmark_runner.common.ocp_resources.create_ocp_resource_operations import CreateOCPResourceOperations
 
 
-class CreateNHCSNR(CreateOCPResourceOperations):
+class CreateNHCFAR(CreateOCPResourceOperations):
     """
-    This class is created node-health-check and self-node-remediation operators
+    This class is created node-health-check and fence-agents-remediation operators
     """
     def __init__(self, oc: OC, path: str, resource_list: list):
         super().__init__(oc)
@@ -17,9 +17,9 @@ class CreateNHCSNR(CreateOCPResourceOperations):
         self.__resource_list = resource_list
 
     @logger_time_stamp
-    def create_nhc_snr(self):
+    def create_nhc_far(self):
         """
-        This method creates node-health-check and self-node-remediation operators
+        This method creates node-health-check and fence-agents-remediation operators
         :return:
         """
         for resource in self.__resource_list:
@@ -30,13 +30,13 @@ class CreateNHCSNR(CreateOCPResourceOperations):
                 self.wait_for_ocp_resource_create(operator='nhc',
                                                   verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[0].status.phase}'",
                                                   status='Succeeded')
-            if '04_snr_subscription.yaml' in resource:
-                self.wait_for_ocp_resource_create(operator='snr',
+            if '04_far_subscription.yaml' in resource:
+                self.wait_for_ocp_resource_create(operator='far',
                                                   verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[1].status.phase}'",
                                                   status='Succeeded')
-            if '05_nhc_snr.yaml' in resource:
+            if '05_nhc_far.yaml' in resource:
                 # Verify NHC is enabled
-                self.wait_for_ocp_resource_create(operator='nhc',
+                self.wait_for_ocp_resource_create(operator='nhc_far',
                                                   verify_cmd="oc get nhc -A -o jsonpath='{range .items[*]}{.status.phase}{\"\\n\"}{end}'",
                                                   status='Enabled')
         return True

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845}/benchmark_runner/common/ocp_resources/create_ocp_resource.py

@@ -8,7 +8,7 @@ from benchmark_runner.common.ocp_resources.create_lso import CreateLSO
 from benchmark_runner.common.ocp_resources.create_odf import CreateODF
 from benchmark_runner.common.ocp_resources.create_kata import CreateKata
 from benchmark_runner.common.ocp_resources.create_cnv import CreateCNV
-from benchmark_runner.common.ocp_resources.create_nhc_snr import CreateNHCSNR
+from benchmark_runner.common.ocp_resources.create_nhc_far import CreateNHCFAR
 from benchmark_runner.common.ocp_resources.create_custom import CreateCustom
 from benchmark_runner.common.ocp_resources.migrate_infra import MigrateInfra
 
@@ -91,9 +91,9 @@ class CreateOCPResource:
         elif 'cnv' == resource:
             create_cnv = CreateCNV(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
             create_cnv.create_cnv()
-        elif 'nhc_snr' == resource:
-            create_nhc_snr = CreateNHCSNR(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
-            create_nhc_snr.create_nhc_snr()
+        elif 'nhc_far' == resource:
+            create_nhc_far = CreateNHCFAR(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_nhc_far.create_nhc_far()
         elif 'infra' == resource:
             create_infra = MigrateInfra(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
             create_infra.migrate_infra()

benchmark_runner-1.0.845/benchmark_runner/common/ocp_resources/nhc_far/template/04_far_subscription_template.yaml

@@ -0,0 +1,11 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+    name: fence-agents-remediation-subscription
+    namespace: openshift-workload-availability
+spec:
+    channel: stable
+    name: fence-agents-remediation
+    source: redhat-operators
+    sourceNamespace: openshift-marketplace
+    package: fence-agents-remediation

benchmark_runner-1.0.845/benchmark_runner/common/ocp_resources/nhc_far/template/05_nhc_far_template.yaml

@@ -0,0 +1,60 @@
+---
+apiVersion: fence-agents-remediation.medik8s.io/v1alpha1
+kind: FenceAgentsRemediationTemplate
+metadata:
+  name: nhc-remediation-far
+  namespace: openshift-workload-availability
+spec:
+  template:
+    spec:
+      nodeparameters:
+        '--ip':
+          master-0: {{ bmc_ips['master-0'] }}
+          master-1: {{ bmc_ips['master-1'] }}
+          master-2: {{ bmc_ips['master-2'] }}
+          worker-0: {{ bmc_ips['worker-0'] }}
+          worker-1: {{ bmc_ips['worker-1'] }}
+          worker-2: {{ bmc_ips['worker-2'] }}
+        '--username':
+          master-0: {{ bmc_user }}
+          master-1: {{ bmc_user }}
+          master-2: {{ bmc_user }}
+          worker-0: {{ bmc_user }}
+          worker-1: {{ bmc_user }}
+          worker-2: {{ bmc_user }}
+        '--password':
+          master-0: {{ bmc_password }}
+          master-1: {{ bmc_password }}
+          master-2: {{ bmc_password }}
+          worker-0: {{ bmc_password }}
+          worker-1: {{ bmc_password }}
+          worker-2: {{ bmc_password }}
+      sharedparameters:
+        '--lanplus': ''
+      agent: fence_ipmilan
+
+---
+apiVersion: remediation.medik8s.io/v1alpha1
+kind: NodeHealthCheck
+metadata:
+  name: nhc-remediation-far
+spec:
+  minHealthy: 2
+  remediationTemplate:
+    apiVersion: fence-agents-remediation.medik8s.io/v1alpha1
+    kind: FenceAgentsRemediationTemplate
+    name: nhc-remediation-far
+    namespace: openshift-workload-availability
+  selector:
+    matchExpressions:
+    - key: node-role.kubernetes.io/worker
+      operator: Exists
+    - key: node-role.kubernetes.io/master
+      operator: Exists
+  unhealthyConditions:
+  - duration: 300s
+    status: "False"
+    type: Ready
+  - duration: 300s
+    status: Unknown
+    type: Ready

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845}/benchmark_runner/krkn_hub/krknhub_workloads.py

@@ -17,6 +17,7 @@ class KrknHubWorkloads(WorkloadsOperations):
         self.__krknhub_workload = self._environment_variables_dict.get('krknhub_workload', '')
         self.__provision_kubeconfig_path = self._environment_variables_dict.get('provision_kubeconfig_path', '')
         self.__krknhub_environment_variables = self._environment_variables_dict.get('krknhub_environment_variables', '')
+        self.__krknhub_yaml_file_path = self._environment_variables_dict.get('krknhub_yaml_file_path', '')
         self.__ssh = SSH()
         self.__krknhub_pod_name = 'bm'
 
@@ -60,7 +61,10 @@ class KrknHubWorkloads(WorkloadsOperations):
         """
         logger.info(f'run krkn-hub: {self.__krknhub_workload}')
         pod_log_path = f'{self._run_artifacts_path}/{self.__krknhub_workload}_pod.log'
-        workload_command = f'{self.__krknhub_environment_variables}; chmod 644 {self.__provision_kubeconfig_path} ; podman run --rm --name={self.__krknhub_pod_name} --net=host --env-host=true -v {self.__provision_kubeconfig_path}:/home/krkn/.kube/config:Z quay.io/krkn-chaos/krkn-hub:{self.__krknhub_workload} &> {pod_log_path}'
+        if self.__krknhub_yaml_file_path:
+            workload_command = f'chmod 644 {self.__provision_kubeconfig_path} ; podman run --rm --name=api-{self.__krknhub_pod_name} -e SCENARIO_BASE64="$(base64 -w0 {self.__krknhub_yaml_file_path})" -e ENABLE_ALERTS=True -e CHECK_CRITICAL_ALERTS=True -e WAIT_DURATION=1000 -v {self.__provision_kubeconfig_path}:/home/krkn/.kube/config:Z quay.io/krkn-chaos/krkn-hub:{self.__krknhub_workload}-bm &> {pod_log_path}'
+        else:
+            workload_command = f'{self.__krknhub_environment_variables}; chmod 644 {self.__provision_kubeconfig_path} ; podman run --rm --name={self.__krknhub_pod_name} --net=host --env-host=true -v {self.__provision_kubeconfig_path}:/home/krkn/.kube/config:Z quay.io/krkn-chaos/krkn-hub:{self.__krknhub_workload} &> {pod_log_path}'
         logger.info(workload_command)
         self.__ssh.run(workload_command)
 

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845}/benchmark_runner/main/environment_variables.py

@@ -4,6 +4,8 @@ import time
 import datetime
 import argparse
 from uuid import uuid4
+from ast import literal_eval
+
 from benchmark_runner.main.environment_variables_exceptions import ParseFailed
 
 
@@ -204,6 +206,7 @@ class EnvironmentVariables:
         self._environment_variables_dict['krknhub_workload'] = EnvironmentVariables.get_env('KRKNHUB_WORKLOAD', '')
         # e.g. "export CLOUD_TYPE='test'; export BMC_USER='user'"
         self._environment_variables_dict['krknhub_environment_variables'] = EnvironmentVariables.get_env('KRKNHUB_ENVIRONMENT_VARIABLES', '')
+        self._environment_variables_dict['krknhub_yaml_file_path'] = EnvironmentVariables.get_env('KRKNHUB_YAML_FILE_PATH', '')
 
         # IBM data
         self._environment_variables_dict['region_name'] = EnvironmentVariables.get_env('IBM_REGION_NAME', '')
@@ -247,7 +250,6 @@ class EnvironmentVariables:
         # upgrade workers duration seconds
         self._environment_variables_dict['upgrade_workers_duration_seconds'] = EnvironmentVariables.get_env('UPGRADE_WORKERS_DURATION_SECONDS', '')
 
-
         # SNO or empty for regular
         self._environment_variables_dict['cluster_type'] = EnvironmentVariables.get_env('CLUSTER_TYPE', '')
         # For SNO: choose 1 master, dictionary: {'master': ['master-0', 'master-1', 'master-2'], 'worker': ['worker-0', 'worker-1', 'worker-2' ] }
@@ -276,8 +278,12 @@ class EnvironmentVariables:
         self._environment_variables_dict['num_odf_disk'] = EnvironmentVariables.get_env('NUM_ODF_DISK', 4)
         self._environment_variables_dict['worker_disk_ids'] = EnvironmentVariables.get_env('WORKER_DISK_IDS', "")
         self._environment_variables_dict['worker_disk_prefix'] = EnvironmentVariables.get_env('WORKER_DISK_PREFIX', '')
-        # install resources list "[ 'lso', 'odf', 'cnv', 'infra', 'custom' ]"
+        # install resources list "[ 'lso', 'odf', 'cnv', 'infra', 'custom', 'kata', 'nhc_far' ]"
         self._environment_variables_dict['install_resources_list'] = EnvironmentVariables.get_env('INSTALL_RESOURCES_LIST', "")
+        # for 'nhc_far' operator
+        self._environment_variables_dict['bmc_user'] = EnvironmentVariables.get_env('BMC_USER', '')
+        self._environment_variables_dict['bmc_password'] = EnvironmentVariables.get_env('BMC_PASSWORD', '')
+        self._environment_variables_dict['bmc_ips'] = literal_eval(EnvironmentVariables.get_env('BMC_IPS', "{}"))
 
         # Parameters below related to 'install_ocp()' and 'install_resource()'
         # Mandatory: OCP environment flavor PERF or FUNC for updating GitHub secrets

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845}/benchmark_runner.egg-info/SOURCES.txt

@@ -66,7 +66,7 @@ benchmark_runner/common/ocp_resources/create_cnv.py
 benchmark_runner/common/ocp_resources/create_custom.py
 benchmark_runner/common/ocp_resources/create_kata.py
 benchmark_runner/common/ocp_resources/create_lso.py
-benchmark_runner/common/ocp_resources/create_nhc_snr.py
+benchmark_runner/common/ocp_resources/create_nhc_far.py
 benchmark_runner/common/ocp_resources/create_ocp_resource.py
 benchmark_runner/common/ocp_resources/create_ocp_resource_exceptions.py
 benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py
@@ -84,11 +84,11 @@ benchmark_runner/common/ocp_resources/lso/template/01_namespace_template.yaml
 benchmark_runner/common/ocp_resources/lso/template/02_operator_group_template.yaml
 benchmark_runner/common/ocp_resources/lso/template/03_catalogsource_template.yaml
 benchmark_runner/common/ocp_resources/lso/template/04_subscription_template.yaml
-benchmark_runner/common/ocp_resources/nhc_snr/template/01_namespace_template.yaml
-benchmark_runner/common/ocp_resources/nhc_snr/template/02_operator_group_template.yaml
-benchmark_runner/common/ocp_resources/nhc_snr/template/03_nhc_subscription_template.yaml
-benchmark_runner/common/ocp_resources/nhc_snr/template/04_snr_subscription_template.yaml
-benchmark_runner/common/ocp_resources/nhc_snr/template/05_nhc_snr_template.yaml
+benchmark_runner/common/ocp_resources/nhc_far/template/01_namespace_template.yaml
+benchmark_runner/common/ocp_resources/nhc_far/template/02_operator_group_template.yaml
+benchmark_runner/common/ocp_resources/nhc_far/template/03_nhc_subscription_template.yaml
+benchmark_runner/common/ocp_resources/nhc_far/template/04_far_subscription_template.yaml
+benchmark_runner/common/ocp_resources/nhc_far/template/05_nhc_far_template.yaml
 benchmark_runner/common/ocp_resources/odf/template/01_delete_disks_template.sh
 benchmark_runner/common/ocp_resources/odf/template/02_label_nodes_template.sh
 benchmark_runner/common/ocp_resources/odf/template/03_local_volume_discovery_template.yaml

{benchmark_runner-1.0.843 → benchmark_runner-1.0.845}/setup.py

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

benchmark_runner-1.0.843/benchmark_runner/common/ocp_resources/nhc_snr/template/04_snr_subscription_template.yaml

@@ -1,11 +0,0 @@
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  name: self-node-remediation-operator
-  namespace: openshift-workload-availability
-spec:
-  channel: stable
-  installPlanApproval: Automatic
-  name: self-node-remediation
-  source: redhat-operators
-  sourceNamespace: openshift-marketplace

benchmark_runner-1.0.843/benchmark_runner/common/ocp_resources/nhc_snr/template/05_nhc_snr_template.yaml

@@ -1,41 +0,0 @@
----
-apiVersion: remediation.medik8s.io/v1alpha1
-kind: NodeHealthCheck
-metadata:
-  name: chaos-nodehealthcheck
-spec:
-  minHealthy: 1
-  remediationTemplate:
-    apiVersion: self-node-remediation.medik8s.io/v1alpha1
-    name: self-node-remediation-automatic-strategy-template
-    namespace: openshift-workload-availability
-    kind: SelfNodeRemediationTemplate
-  selector:
-    matchExpressions:
-      - key: node-role.kubernetes.io/worker
-        operator: Exists
-  unhealthyConditions:
-    - type: Ready
-      status: "False"
-      duration: 20s
-    - type: Ready
-      status: Unknown
-      duration: 20s
-
----
-apiVersion: v1
-items:
-  - apiVersion: self-node-remediation.medik8s.io/v1alpha1
-    kind: SelfNodeRemediationTemplate
-    metadata:
-      annotations:
-        remediation.medik8s.io/multiple-templates-support: "true"
-      name: self-node-remediation-automatic-strategy-template
-      namespace: openshift-workload-availability
-    spec:
-      template:
-        spec:
-          remediationStrategy: OutOfServiceTaint
-kind: List
-metadata:
-  resourceVersion: ""