Merge branch 'develop'

elabit · Oct 21, 2022 · 6bc729c · 6bc729c
2 parents 19484e2 + 401247c
commit 6bc729c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.4.1 - 2022-10-21
+
+### Fixed
+
+* agent plugin: fixed bug when piggyback was set, runner crashed
+
 ## 1.4.0 - 2022-10-13
 
 ### Changed 

diff --git a/agents_plugins/robotmk.py b/agents_plugins/robotmk.py
@@ -34,7 +34,7 @@
 
 local_tz = datetime.utcnow().astimezone().tzinfo
 
-ROBOTMK_VERSION = 'v1.4.0'
+ROBOTMK_VERSION = 'v1.4.1'
 
 
 class RMKConfig:
@@ -695,7 +695,7 @@ def global_dict(self):
     @property
     def piggybackhost(self):
         pb_host = self.suite_dict.get("piggybackhost", None)
-        return ("piggybackhost", piggybackhost) if pb_host else None
+        return ("piggybackhost", pb_host) if pb_host else None
 
     # Suite timestamp for filenames
     @property

diff --git a/bakery/v1/robotmk.py b/bakery/v1/robotmk.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # This file is part of the Robotmk project (https://www.robotmk.org)
 
-ROBOTMK_VERSION = 'v1.4.0'
+ROBOTMK_VERSION = 'v1.4.1'
 
 import cmk.utils.paths
 import os

diff --git a/bakery/v2/robotmk.py b/bakery/v2/robotmk.py
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # This file is part of the Robotmk project (https://www.robotmk.org)
 
-ROBOTMK_VERSION = 'v1.4.0'
+ROBOTMK_VERSION = 'v1.4.1'
 
 from typing import Iterable, TypedDict, List
 from pathlib import Path

diff --git a/checks/v1/robotmk b/checks/v1/robotmk
@@ -21,7 +21,7 @@ from collections import namedtuple
 iam = "robotmk"
 # DO NOT DELETE
 inventory_robotmk_rules = []
-ROBOTMK_VERSION = 'v1.4.0'
+ROBOTMK_VERSION = 'v1.4.1'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'var/robotmk')
 

diff --git a/checks/v2/robotmk.py b/checks/v2/robotmk.py
@@ -22,7 +22,7 @@
 from cmk.base.plugins.agent_based.agent_based_api.v1 import *
 from cmk.utils.exceptions import MKGeneralException
 
-ROBOTMK_VERSION = 'v1.4.0'
+ROBOTMK_VERSION = 'v1.4.1'
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'var/robotmk')