From c44d5a3f19897a48c9df305ebf670e2d80b37e7d Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Tue, 24 Dec 2024 10:57:35 +0100 Subject: [PATCH] Bugfix workflow files. --- .github/workflows/ans-int-test-contact_group.yaml | 10 ---------- .github/workflows/ans-int-test-discovery.yaml | 10 ---------- .github/workflows/ans-int-test-downtime.yaml | 10 ---------- .github/workflows/ans-int-test-folder.yaml | 10 ---------- .github/workflows/ans-int-test-host.yaml | 10 ---------- .github/workflows/ans-int-test-host_group.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-bakery.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-folder.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-folders.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-host.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-hosts.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-rules.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-rulesets.yaml | 10 ---------- .github/workflows/ans-int-test-lkp-version.yaml | 10 ---------- .github/workflows/ans-int-test-password.yaml | 10 ---------- .github/workflows/ans-int-test-rule.yaml | 10 ---------- .github/workflows/ans-int-test-service_group.yaml | 10 ---------- .github/workflows/ans-int-test-tag_group.yaml | 10 ---------- .github/workflows/ans-int-test-timeperiod.yaml | 10 ---------- .github/workflows/ans-int-test-user.yaml | 10 ---------- 20 files changed, 200 deletions(-) diff --git a/.github/workflows/ans-int-test-contact_group.yaml b/.github/workflows/ans-int-test-contact_group.yaml index ed628b28c..e2283f77c 100644 --- a/.github/workflows/ans-int-test-contact_group.yaml +++ b/.github/workflows/ans-int-test-contact_group.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-discovery.yaml b/.github/workflows/ans-int-test-discovery.yaml index 6572ecab6..3e1263b21 100644 --- a/.github/workflows/ans-int-test-discovery.yaml +++ b/.github/workflows/ans-int-test-discovery.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-downtime.yaml b/.github/workflows/ans-int-test-downtime.yaml index 54af17dee..1cb28bcfa 100644 --- a/.github/workflows/ans-int-test-downtime.yaml +++ b/.github/workflows/ans-int-test-downtime.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-folder.yaml b/.github/workflows/ans-int-test-folder.yaml index f718f506b..4cd2dffd0 100644 --- a/.github/workflows/ans-int-test-folder.yaml +++ b/.github/workflows/ans-int-test-folder.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-host.yaml b/.github/workflows/ans-int-test-host.yaml index 70625bfd8..5f64aef42 100644 --- a/.github/workflows/ans-int-test-host.yaml +++ b/.github/workflows/ans-int-test-host.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-host_group.yaml b/.github/workflows/ans-int-test-host_group.yaml index a3b4b9ef1..9906a3173 100644 --- a/.github/workflows/ans-int-test-host_group.yaml +++ b/.github/workflows/ans-int-test-host_group.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-bakery.yaml b/.github/workflows/ans-int-test-lkp-bakery.yaml index 65b44ec9c..204af73fd 100644 --- a/.github/workflows/ans-int-test-lkp-bakery.yaml +++ b/.github/workflows/ans-int-test-lkp-bakery.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cfe: - image: checkmk/check-mk-free:2.1.0p49 - ports: - - 5421:5000 - env: - CMK_SITE_ID: "ancient_cfe" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cce: image: checkmk/check-mk-cloud:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-folder.yaml b/.github/workflows/ans-int-test-lkp-folder.yaml index 51762bb63..6a9534c6f 100644 --- a/.github/workflows/ans-int-test-lkp-folder.yaml +++ b/.github/workflows/ans-int-test-lkp-folder.yaml @@ -60,16 +60,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-folders.yaml b/.github/workflows/ans-int-test-lkp-folders.yaml index e23183f09..011c08b6d 100644 --- a/.github/workflows/ans-int-test-lkp-folders.yaml +++ b/.github/workflows/ans-int-test-lkp-folders.yaml @@ -60,16 +60,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-host.yaml b/.github/workflows/ans-int-test-lkp-host.yaml index a7c40430f..06e5fb059 100644 --- a/.github/workflows/ans-int-test-lkp-host.yaml +++ b/.github/workflows/ans-int-test-lkp-host.yaml @@ -60,16 +60,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-hosts.yaml b/.github/workflows/ans-int-test-lkp-hosts.yaml index f47f6d755..75fcef50f 100644 --- a/.github/workflows/ans-int-test-lkp-hosts.yaml +++ b/.github/workflows/ans-int-test-lkp-hosts.yaml @@ -60,16 +60,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-rules.yaml b/.github/workflows/ans-int-test-lkp-rules.yaml index 957aa3288..ff258f0c0 100644 --- a/.github/workflows/ans-int-test-lkp-rules.yaml +++ b/.github/workflows/ans-int-test-lkp-rules.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-rulesets.yaml b/.github/workflows/ans-int-test-lkp-rulesets.yaml index 139090c4a..452583480 100644 --- a/.github/workflows/ans-int-test-lkp-rulesets.yaml +++ b/.github/workflows/ans-int-test-lkp-rulesets.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-lkp-version.yaml b/.github/workflows/ans-int-test-lkp-version.yaml index 5bcb09028..48ddb9bad 100644 --- a/.github/workflows/ans-int-test-lkp-version.yaml +++ b/.github/workflows/ans-int-test-lkp-version.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-password.yaml b/.github/workflows/ans-int-test-password.yaml index ebe6dcc56..e62034c2e 100644 --- a/.github/workflows/ans-int-test-password.yaml +++ b/.github/workflows/ans-int-test-password.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-rule.yaml b/.github/workflows/ans-int-test-rule.yaml index 3165ab0a1..d63d5610c 100644 --- a/.github/workflows/ans-int-test-rule.yaml +++ b/.github/workflows/ans-int-test-rule.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-service_group.yaml b/.github/workflows/ans-int-test-service_group.yaml index d73cc1e67..bd81ae026 100644 --- a/.github/workflows/ans-int-test-service_group.yaml +++ b/.github/workflows/ans-int-test-service_group.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-tag_group.yaml b/.github/workflows/ans-int-test-tag_group.yaml index f683b5527..eb9a5ac2a 100644 --- a/.github/workflows/ans-int-test-tag_group.yaml +++ b/.github/workflows/ans-int-test-tag_group.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-timeperiod.yaml b/.github/workflows/ans-int-test-timeperiod.yaml index 7e8026744..80404747b 100644 --- a/.github/workflows/ans-int-test-timeperiod.yaml +++ b/.github/workflows/ans-int-test-timeperiod.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: diff --git a/.github/workflows/ans-int-test-user.yaml b/.github/workflows/ans-int-test-user.yaml index b2af8ab7d..0fbd0a6e1 100644 --- a/.github/workflows/ans-int-test-user.yaml +++ b/.github/workflows/ans-int-test-user.yaml @@ -62,16 +62,6 @@ jobs: python: '3.10' services: -<<<<<<< HEAD - ancient_cre: - image: checkmk/check-mk-raw:2.1.0p49 - ports: - - 5021:5000 - env: - CMK_SITE_ID: "ancient_cre" - CMK_PASSWORD: "Sup3rSec4et!" -======= ->>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.) old_cre: image: checkmk/check-mk-raw:2.2.0p37 ports: