Skip to content

Commit

Permalink
Fix Checkmk versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
robin-checkmk committed Apr 26, 2024
1 parent 2c23b16 commit 2dde723
Show file tree
Hide file tree
Showing 31 changed files with 111 additions and 111 deletions.
2 changes: 1 addition & 1 deletion roles/agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ It can be installed as easy as running:

## Role Variables

checkmk_agent_version: "2.3.0b3"
checkmk_agent_version: "2.3.0b6"

The Checkmk version of the site your agents will talk to.

Expand Down
2 changes: 1 addition & 1 deletion roles/agent/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
checkmk_agent_version: "2.3.0b3"
checkmk_agent_version: "2.3.0b6"
checkmk_agent_edition: cre
checkmk_agent_server_protocol: http
checkmk_agent_server: localhost
Expand Down
2 changes: 1 addition & 1 deletion roles/agent/molecule/2.1.0/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# General
checkmk_var_version: "2.2.0p24"
checkmk_var_version: "2.1.0p42"
checkmk_var_edition: "cre"
checkmk_var_checkmk_site: "mysite"
checkmk_var_automation_user: "cmkadmin"
Expand Down
2 changes: 1 addition & 1 deletion roles/agent/molecule/2.2.0/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# General
checkmk_var_version: "2.3.0b3"
checkmk_var_version: "2.2.0p25"
checkmk_var_edition: "cre"
checkmk_var_checkmk_site: "mysite"
checkmk_var_automation_user: "cmkadmin"
Expand Down
2 changes: 1 addition & 1 deletion roles/server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ To learn about the distributions used in automated tests, inspect the correspond

## Role Variables

checkmk_server_version: "2.3.0b3"
checkmk_server_version: "2.3.0b6"

The global Checkmk version. This is used for installing Checkmk.
To manage sites and their version, see `checkmk_server_sites`.
Expand Down
2 changes: 1 addition & 1 deletion roles/server/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ checkmk_server_server_stable_os:
- Ubuntu-20
- Ubuntu-22

checkmk_server_version: "2.3.0b3"
checkmk_server_version: "2.3.0b6"
checkmk_server_edition: cre
checkmk_server_verify_setup: 'true'

Expand Down
2 changes: 1 addition & 1 deletion roles/server/molecule/2.1.0/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# General
checkmk_var_version: "2.2.0p24"
checkmk_var_version: "2.1.0p42"
checkmk_var_edition: "cre"
checkmk_server_verify_setup: 'true'
checkmk_var_server_url: "http://127.0.0.1/"
Expand Down
2 changes: 1 addition & 1 deletion roles/server/molecule/2.2.0/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# General
checkmk_var_version: "2.3.0b3"
checkmk_var_version: "2.2.0p25"
checkmk_var_edition: "cre"
checkmk_server_verify_setup: 'true'
checkmk_var_server_url: "http://127.0.0.1/"
Expand Down
22 changes: 11 additions & 11 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
collection_dir="${script_dir%/*}"

# Update these as necessary:
checkmk_ancient="2.1.0p41"
checkmk_oldstable="2.2.0p24"
checkmk_stable="2.3.0b4"
checkmk_ancient="2.1.0p42"
checkmk_oldstable="2.2.0p25"
checkmk_stable="2.3.0b6"

while getopts 's:t:' OPTION; do
case "$OPTION" in
Expand All @@ -41,16 +41,16 @@ echo "# Changes:"
sed -i "s/version: ${source_version}/version: ${target_version}/g" "${collection_dir}/galaxy.yml" && echo "Updated Collection version in 'galaxy.yml' from ${source_version} to ${target_version}."
# The following is quite hacky, but it works well enough. If you want to tame the sed monster, have at it. Otherwise be careful with changes here.
## Integration tests
find "${collection_dir}/tests/integration/targets/" -type f -name main.yml -exec sed -i "s/2.2.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated Checkmk Stable version for integration tests to ${checkmk_stable}."
find "${collection_dir}/tests/integration/targets/" -type f -name main.yml -exec sed -i "s/2.1.0.*/${checkmk_oldstable}\"/g" {} \; && echo "Updated Checkmk Oldstable version for integration tests to ${checkmk_oldstable}."
find "${collection_dir}/tests/integration/targets/" -type f -name main.yml -exec sed -i "s/2.0.0.*/${checkmk_ancient}\"/g" {} \; && echo "Updated Checkmk Ancient version for integration tests to ${checkmk_ancient}."
find "${collection_dir}/tests/integration/targets/" -type f -name main.yml -exec sed -i "s/2.3.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated Checkmk Stable version for integration tests to ${checkmk_stable}."
find "${collection_dir}/tests/integration/targets/" -type f -name main.yml -exec sed -i "s/2.2.0.*/${checkmk_oldstable}\"/g" {} \; && echo "Updated Checkmk Oldstable version for integration tests to ${checkmk_oldstable}."
find "${collection_dir}/tests/integration/targets/" -type f -name main.yml -exec sed -i "s/2.1.0.*/${checkmk_ancient}\"/g" {} \; && echo "Updated Checkmk Ancient version for integration tests to ${checkmk_ancient}."
## Molecule tests
find "${collection_dir}/roles/" -type f -name all.yml -exec sed -i "s/2.2.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated Checkmk Stable version for molecule tests to ${checkmk_stable}."
find "${collection_dir}/roles/" -type f -name all.yml -exec sed -i "s/2.1.0.*/${checkmk_oldstable}\"/g" {} \; && echo "Updated Checkmk Oldstable version for molecule tests to ${checkmk_oldstable}."
find "${collection_dir}/roles/" -type f -name all.yml -exec sed -i "s/2.0.0.*/${checkmk_ancient}\"/g" {} \; && echo "Updated Checkmk Ancient version for molecule tests to ${checkmk_ancient}."
find "${collection_dir}/roles/" -type f -name all.yml -exec sed -i "s/2.3.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated Checkmk Stable version for molecule tests to ${checkmk_stable}."
find "${collection_dir}/roles/" -type f -name all.yml -exec sed -i "s/2.2.0.*/${checkmk_oldstable}\"/g" {} \; && echo "Updated Checkmk Oldstable version for molecule tests to ${checkmk_oldstable}."
find "${collection_dir}/roles/" -type f -name all.yml -exec sed -i "s/2.1.0.*/${checkmk_ancient}\"/g" {} \; && echo "Updated Checkmk Ancient version for molecule tests to ${checkmk_ancient}."
# Roles:
find "${collection_dir}/roles/" -type f -name main.yml -exec sed -i "s/2.2.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated default Checkmk version for roles to ${checkmk_stable}."
find "${collection_dir}/roles/" -type f -name README.md -exec sed -i "s/2.2.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated default Checkmk version in roles README to ${checkmk_stable}."
find "${collection_dir}/roles/" -type f -name main.yml -exec sed -i "s/2.3.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated default Checkmk version for roles to ${checkmk_stable}."
find "${collection_dir}/roles/" -type f -name README.md -exec sed -i "s/2.3.0.*/${checkmk_stable}\"/g" {} \; && echo "Updated default Checkmk version in roles README to ${checkmk_stable}."
# Support Matrix
grep "${target_version}" "${collection_dir}/SUPPORT.md" || echo "${target_version} | ${checkmk_ancient}, ${checkmk_oldstable}, ${checkmk_stable} | 2.15, 2.16, 2.17 | None" >> "${collection_dir}/SUPPORT.md" && echo "Added line to compatibility matrix in SUPPORT.md."

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/activation/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
6 changes: 3 additions & 3 deletions tests/integration/targets/bakery/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cee"
site: "old_cee"
- version: "2.2.0p24"
- version: "2.1.0p42"
edition: "cee"
site: "ancient_cee"

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/targets/contact_group/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cme"
site: "stable_cme"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/discovery/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/downtime/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/folder/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/host/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/targets/host_group/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cme"
site: "stable_cme"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
6 changes: 3 additions & 3 deletions tests/integration/targets/lookup_bakery/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cee"
site: "old_cee"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cee"
site: "ancient_cee"
8 changes: 4 additions & 4 deletions tests/integration/targets/lookup_folder/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/lookup_folders/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/lookup_host/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/lookup_hosts/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/lookup_rules/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
test_sites:
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cee"
site: "stable_cee"
- version: "2.3.0b3"
- version: "2.3.0b6"
edition: "cre"
site: "stable_cre"
- version: "2.2.0p24"
- version: "2.2.0p25"
edition: "cre"
site: "old_cre"
- version: "2.1.0p41"
- version: "2.1.0p42"
edition: "cre"
site: "ancient_cre"

Expand Down
Loading

0 comments on commit 2dde723

Please sign in to comment.