Skip to content

Commit 12a8369

Browse files
committed
Start using rhel-10.2
- Use rhel-10.2 for the development RHEL 10 version Signed-off-by: Renata Ravanelli <[email protected]>
1 parent 7bb1eb8 commit 12a8369

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To support building both a RHEL-based and a CentOS Stream-based CoreOS, the
1313
coreos-assembler concept of [variants] is used. The following variants are
1414
supported:
1515

16-
- RHEL-based variants: `rhel-9.8`, `rhel-10.1`
16+
- RHEL-based variants: `rhel-9.8`, `rhel-10.2`
1717
- CentOS Stream-based variants: `c9s`, `c10s`
1818

1919
The default variant is `rhel-9.8`.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Pass to buildah/podman using `--build-arg-file`.
33

44
NAME=rhcos
5-
VERSION="10.1"
6-
BUILDER_IMG=registry.redhat.io/rhel10/rhel-bootc:10.1
7-
MANIFEST=manifest-rhel-10.1.yaml
5+
VERSION="10.2"
6+
BUILDER_IMG=registry.redhat.io/rhel10/rhel-bootc:10.2
7+
MANIFEST=manifest-rhel-10.2.yaml
88
# XXX: see inject_passwd_group() in build-rootfs
99
PASSWD_GROUP_DIR=.
10-
STREAM=rhel-10.1
10+
STREAM=rhel-10.2

ci/prow-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,13 @@ main() {
298298
;;
299299
"rhcos-10-build-test-qemu")
300300
setup_user
301-
cosa_init "rhel-10.1"
301+
cosa_init "rhel-10.2"
302302
cosa_build
303303
kola_test_qemu
304304
;;
305305
"rhcos-10-build-test-metal")
306306
setup_user
307-
cosa_init "rhel-10.1"
307+
cosa_init "rhel-10.2"
308308
cosa_build
309309
kola_test_metal
310310
;;

common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ conditional-include:
4343
- if: osversion == "centos-10"
4444
include:
4545
- manifest-el10-shared.yaml
46-
- if: osversion == "rhel-10.1"
46+
- if: osversion == "rhel-10.2"
4747
include:
4848
- manifest-el10-shared.yaml
4949
# We also pick up from fedora-bootc while not deriving until we can move

docs/development-rhcos.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ For versions older than 4.9, see the internal documentation.
3333
If you're going to work on RHCOS based on different versions of RHEL, using a
3434
dedicated directory for each RHEL version is recommended:
3535
```
36-
$ mkdir rhcos-rhel-10.1
37-
$ cd rhcos-rhel-10.1
36+
$ mkdir rhcos-rhel-10.2
37+
$ cd rhcos-rhel-10.2
3838
```
3939

4040
- Make sure that you have setup the latest internal Red Hat root certificates
@@ -59,10 +59,10 @@ For versions older than 4.9, see the internal documentation.
5959
$ cosa init --yumrepos "${RHCOS_REPO}" https://github.com/coreos/rhel-coreos-config.git
6060
6161
# Main developement branch, selecting a specific variant
62-
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-10.1 https://github.com/coreos/rhel-coreos-config.git
62+
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-10.2 https://github.com/coreos/rhel-coreos-config.git
6363
6464
# Specific develepment branch, selecting a specific variant
65-
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-10.1 --branch foobar https://github.com/coreos/rhel-coreos-config.git
65+
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-10.2 --branch foobar https://github.com/coreos/rhel-coreos-config.git
6666
```
6767

6868
- Fetch packages and build RHCOS ostree container and QEMU image:

kola-denylist.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
tracker: https://github.com/openshift/os/issues/1751
1717
osversion:
1818
- centos-10
19-
- rhel-10.1
19+
- rhel-10.2
2020

2121
# Secureboot in CentOS Stream 10 regressed.
2222
# - https://github.com/coreos/rhel-coreos-config/issues/130
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
# Manifest for RHCOS based on RHEL 10.1
1+
# Manifest for RHCOS based on RHEL 10.2
22

33
metadata:
44
license: MIT
55
name: rhcos
6-
summary: RHEL CoreOS 10.1
6+
summary: RHEL CoreOS 10.2
77

88
variables:
99
id: "rhel"
10-
osversion: "rhel-10.1"
10+
osversion: "rhel-10.2"
1111

1212
# Include manifests common to all RHEL and CentOS Stream versions
1313
include:
1414
- common.yaml
1515

1616
repos:
17-
- rhel-10.1-baseos
18-
- rhel-10.1-appstream
19-
- rhel-10.1-early-kernel
17+
- rhel-10.2-baseos
18+
- rhel-10.2-appstream
19+
- rhel-10.2-early-kernel
2020

21-
automatic-version-prefix: "10.1.<date:%Y%m%d>"
21+
automatic-version-prefix: "10.2.<date:%Y%m%d>"
2222
# This ensures we're semver-compatible which OpenShift wants
2323
automatic-version-suffix: "-"
2424

25-
mutate-os-release: "10.1"
25+
mutate-os-release: "10.2"
2626

2727
# Packages that are only in RHCOS and not in SCOS or that have special
2828
# constraints that do not apply to SCOS

packages-overrides.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ conditional-include:
2121
## - c9s-appstream-mirror
2222
## packages:
2323
## - foo-1.2
24-
##- if: osversion == "rhel-10.1"
24+
##- if: osversion == "rhel-10.2"
2525
## include:
2626
## packages:
2727
## - foo-1.2

0 commit comments

Comments
 (0)