Merge pull request #664 from vrutkovs/4.14-crio-1.27

[release-4.14] Use CRI-O 1.27, rpm-ostree from FCOS stable
openshift · Sep 28, 2023 · 0937dbc · 0937dbc
2 parents 446fa3b + 7ceeeb6
commit 0937dbc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/coreos-continuous.repo b/coreos-continuous.repo
diff --git a/crio.repo b/crio.repo
@@ -0,0 +1,15 @@
+[cri-o_1.27]
+name=devel:kubic:libcontainers:stable:cri-o:1.27 (Fedora_38)
+type=rpm-md
+baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.27/Fedora_38/
+gpgcheck=1
+gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.27/Fedora_38/repodata/repomd.xml.key
+enabled=1
+
+[cri-tools]
+name=Stable Releases of Upstream github.com/containers packages (Fedora_38)
+type=rpm-md
+baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Fedora_38/
+gpgcheck=1
+gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Fedora_38/repodata/repomd.xml.key
+enabled=1
diff --git a/overrides.yaml b/overrides.yaml
@@ -2,10 +2,3 @@ override-remove:
  - moby-engine
  - zincati
 
-ex-override-replace:
-  - from:
-      repo: coreos-continuous
-    packages:
-      # Pull the latest fix for https://issues.redhat.com/browse/OKD-63
-      - rpm-ostree
-      - rpm-ostree-libs