Bugfix workflow files.

Checkmk · Dec 24, 2024 · c44d5a3 · c44d5a3
1 parent 2f0b7e8
commit c44d5a3
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 200 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: