Merge pull request #566 from miabbott/master_is_49

changes to master branch for RHCOS 4.9 builds
openshift · Jun 18, 2021 · f683733 · f683733
2 parents 8cc9d79 + a877d6f
commit f683733
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "fedora-coreos-config"]
 	path = fedora-coreos-config
 	url = https://github.com/coreos/fedora-coreos-config
-	branch = rhcos-4.8
+	branch = testing-devel
diff --git a/fedora-coreos-config b/fedora-coreos-config
diff --git a/manifest.yaml b/manifest.yaml
@@ -32,10 +32,10 @@ repos:
   - rhel-8-server-ose
 
 # We include hours/minutes to avoid version number reuse
-automatic-version-prefix: "48.84.<date:%Y%m%d%H%M>"
+automatic-version-prefix: "49.84.<date:%Y%m%d%H%M>"
 # This ensures we're semver-compatible which OpenShift wants
 automatic-version-suffix: "-"
-mutate-os-release: "4.8"
+mutate-os-release: "4.9"
 
 documentation: false
 initramfs-args:

diff --git a/rhcos-packages.yaml b/rhcos-packages.yaml
@@ -10,7 +10,7 @@ packages:
   # installer iso packages
   - coreos-installer coreos-installer-bootinfra
   - ignition
-  - redhat-release-coreos-48.84 # Pinned for 8.4 Beta switch
+  - redhat-release-coreos
   ## Delivered via RHEL Base/Appstream (usually)
   # needed by rpm-ostree for managing users
   - nss-altfiles