Skip to content

Commit c44d5a3

Browse files
robin-checkmkrobin-checkmk
committed
Bugfix workflow files.
1 parent 2f0b7e8 commit c44d5a3

20 files changed

+0
-200
lines changed

‎.github/workflows/ans-int-test-contact_group.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-discovery.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-downtime.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-folder.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-host.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-host_group.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-lkp-bakery.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cfe:
67-
image: checkmk/check-mk-free:2.1.0p49
68-
ports:
69-
- 5421:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cfe"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cce:
7666
image: checkmk/check-mk-cloud:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-lkp-folder.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ jobs:
6060
python: '3.10'
6161

6262
services:
63-
<<<<<<< HEAD
64-
ancient_cre:
65-
image: checkmk/check-mk-raw:2.1.0p49
66-
ports:
67-
- 5021:5000
68-
env:
69-
CMK_SITE_ID: "ancient_cre"
70-
CMK_PASSWORD: "Sup3rSec4et!"
71-
=======
72-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7363
old_cre:
7464
image: checkmk/check-mk-raw:2.2.0p37
7565
ports:

‎.github/workflows/ans-int-test-lkp-folders.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ jobs:
6060
python: '3.10'
6161

6262
services:
63-
<<<<<<< HEAD
64-
ancient_cre:
65-
image: checkmk/check-mk-raw:2.1.0p49
66-
ports:
67-
- 5021:5000
68-
env:
69-
CMK_SITE_ID: "ancient_cre"
70-
CMK_PASSWORD: "Sup3rSec4et!"
71-
=======
72-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7363
old_cre:
7464
image: checkmk/check-mk-raw:2.2.0p37
7565
ports:

‎.github/workflows/ans-int-test-lkp-host.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ jobs:
6060
python: '3.10'
6161

6262
services:
63-
<<<<<<< HEAD
64-
ancient_cre:
65-
image: checkmk/check-mk-raw:2.1.0p49
66-
ports:
67-
- 5021:5000
68-
env:
69-
CMK_SITE_ID: "ancient_cre"
70-
CMK_PASSWORD: "Sup3rSec4et!"
71-
=======
72-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7363
old_cre:
7464
image: checkmk/check-mk-raw:2.2.0p37
7565
ports:

‎.github/workflows/ans-int-test-lkp-hosts.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ jobs:
6060
python: '3.10'
6161

6262
services:
63-
<<<<<<< HEAD
64-
ancient_cre:
65-
image: checkmk/check-mk-raw:2.1.0p49
66-
ports:
67-
- 5021:5000
68-
env:
69-
CMK_SITE_ID: "ancient_cre"
70-
CMK_PASSWORD: "Sup3rSec4et!"
71-
=======
72-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7363
old_cre:
7464
image: checkmk/check-mk-raw:2.2.0p37
7565
ports:

‎.github/workflows/ans-int-test-lkp-rules.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-lkp-rulesets.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-lkp-version.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-password.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-rule.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-service_group.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-tag_group.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-timeperiod.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

‎.github/workflows/ans-int-test-user.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
python: '3.10'
6363

6464
services:
65-
<<<<<<< HEAD
66-
ancient_cre:
67-
image: checkmk/check-mk-raw:2.1.0p49
68-
ports:
69-
- 5021:5000
70-
env:
71-
CMK_SITE_ID: "ancient_cre"
72-
CMK_PASSWORD: "Sup3rSec4et!"
73-
=======
74-
>>>>>>> 6fa3ec61 (Add 2.4.0 CME and remove 2.1.0.)
7565
old_cre:
7666
image: checkmk/check-mk-raw:2.2.0p37
7767
ports:

0 commit comments

Comments
 (0)