Merge pull request #4906 from VladimirSlavik/master-stop-f38-infra

infra: Don't consider the Fedora 38 branch anymore
rhinstaller · Jul 12, 2023 · 3ea6d39 · 3ea6d39
2 parents e7e777b + d179831
commit 3ea6d39
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/.branch-variables.yml b/.branch-variables.yml
@@ -10,5 +10,5 @@ distro_name: "fedora" # "fedora" or "rhel"
 distro_release: "rawhide" # "rawhide" or a number without quotation marks
 
 # The following only applies for rawhide.
-branched_fedora_version: 38 # number without quotation marks, or nothing if CI should not run for branched Fedora
+branched_fedora_version: # number without quotation marks, or nothing if CI should not run for branched Fedora
 rawhide_fedora_version: 39 # ditto
diff --git a/.github/workflows/container-autoupdate-fedora.yml b/.github/workflows/container-autoupdate-fedora.yml
@@ -26,9 +26,3 @@ jobs:
       container-tag: master
       branch: master
 
-  fedora-38:
-    uses: ./.github/workflows/container-rebuild-action.yml
-    secrets: inherit
-    with:
-      container-tag: fedora-38
-      branch: fedora-38
diff --git a/.github/workflows/tests-daily.yml b/.github/workflows/tests-daily.yml
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release: ['master', 'fedora-38']
+        release: ['master']
         include:
           - release: 'master'
             target_branch: 'master'
@@ -50,9 +50,6 @@ jobs:
           #  target_branch: 'master'
           #  ci_tag: 'eln'
           #  build-args: '--build-arg=image=quay.io/fedoraci/fedora:eln-x86_64'
-          - release: 'fedora-38'
-            target_branch: 'fedora-38'
-            ci_tag: 'fedora-38'
 
     env:
       CI_TAG: '${{ matrix.ci_tag }}'
@@ -83,14 +80,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release: ['master', 'fedora-38']
+        release: ['master']
         include:
           - release: 'master'
             target_branch: 'master'
             ci_tag: 'master'
-          - release: 'fedora-38'
-            target_branch: 'fedora-38'
-            ci_tag: 'fedora-38'
 
     env:
       CI_TAG: '${{ matrix.ci_tag }}'

diff --git a/.github/workflows/try-release-daily.yml b/.github/workflows/try-release-daily.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['master', 'rhel-8', 'rhel-9', 'fedora-38']
+        branch: ['master', 'rhel-8', 'rhel-9']
 
     steps:
       - name: Check out repo