Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
simonmeggle committed Oct 13, 2022
2 parents bd747f4 + dfae23e commit 19484e2
Show file tree
Hide file tree
Showing 13 changed files with 596 additions and 463 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile_cmk_python
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN cd /tmp && wget https://www.python.org/ftp/python/3.9.4/Python-3.9.4.tgz \
&& make install

# install python modules to run the Robotmk plugin in this container
RUN pip3 install robotframework pyyaml mergedeep python-dateutil ipdb
RUN pip3 install robotframework pyyaml mergedeep python-dateutil ipdb

RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends jq tree htop vim git telnet file less tmux
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"yzhang.markdown-all-in-one",
"GitHub.copilot",
"Gruntfuggly.todo-tree",
"rogalmic.bash-debug"
"rogalmic.bash-debug",
"almenon.arepl"
]
}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ 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.0 - 2022-10-13

### Changed

* The Robotmk mechanism behind the RF parameter `--exitonfailure` has been optimized and clearly documented in the inline help. If this option was set, the remaining tests that were not executed were previously marked as FAIL or CRITICAL. This is the default in Robot Framework (see [RF user guide](http://robotframework.org/robotframework/latest/RobotFrameworkUserGuide.html#stopping-when-first-test-case-fails)), but in Checkmk it lead to an alarm not only for the root cause (the failed test), but also for the subsequent errors.
The behavior of Robotmk has been slightly modified in that the tests omitted due to a previous failure are filtered out and not passed to Checkmk for evaluation anymore. Tests that have not been executed become "stale", and false alarms are thus avoided. (Thanks for the valuable feedback.)


## 1.3.1 - 2022-10-13

### Fixed
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

*A complete solution to integrate **Robot Framework** End2End tests into **Checkmk***
*An enterprise-ready solution to integrate **Robot Framework** End2End tests into **Checkmk***

<!-- [![Build Status](https://travis-ci.com/simonmeggle/robotmk.svg?branch=develop)](https://travis-ci.com/simonmeggle/robotmk) ![.github/workflows/github-markdown-toc.yml](https://github.com/elabit/robotmk/workflows/.github/workflows/github-markdown-toc.yml/badge.svg) -->

Expand Down Expand Up @@ -70,7 +70,8 @@ The Robotmk project consists of different components working together:
* Use the Checkmk WATO rule editor to decide which remote hosts should be deployed with the Robotmk plugin.
* Define which suites should be executed on the test host
* Parametrize the Robot tests with commandline options of Robot Framework - no CLI needed.
* Let Robot Framework repeat failed tests for certain number of attempts. This is a very useful and outstanding feature to get more stable results if the SUT behaves unconsistently.
* Let Robot Framework repeat failed tests for certain number of attempts. This is a very useful and outstanding feature to get more stable results if the SUT behaves unconsistently. You can even control to repeat singular tests incrementally (and merge the results after n iterations) or to always repeat the test suite as a whole.
* Robotmk can handle dependencies between testcases - only the root cause gets alerted.
* Robotmk **plugins** - executes RF tests:
* the `robotmk-runner` is a kind of wrapper for RF tests on the client side. It gets controlled by the robotmk YML file which is created by the bakery.
* the `robotmk` plugin is executed as a normal plugin and reads the results written by the runner plugin.
Expand Down
2 changes: 1 addition & 1 deletion agents_plugins/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

local_tz = datetime.utcnow().astimezone().tzinfo

ROBOTMK_VERSION = 'v1.3.1'
ROBOTMK_VERSION = 'v1.4.0'


class RMKConfig:
Expand Down
2 changes: 1 addition & 1 deletion bakery/v1/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1'
ROBOTMK_VERSION = 'v1.4.0'

import cmk.utils.paths
import os
Expand Down
2 changes: 1 addition & 1 deletion bakery/v2/robotmk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1'
ROBOTMK_VERSION = 'v1.4.0'

from typing import Iterable, TypedDict, List
from pathlib import Path
Expand Down
2 changes: 1 addition & 1 deletion checks/v1/robotmk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ from collections import namedtuple
iam = "robotmk"
# DO NOT DELETE
inventory_robotmk_rules = []
ROBOTMK_VERSION = 'v1.3.1'
ROBOTMK_VERSION = 'v1.4.0'
DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
HTML_LOG_DIR = "%s/%s" % (os.environ['OMD_ROOT'], 'var/robotmk')

Expand Down
Loading

0 comments on commit 19484e2

Please sign in to comment.