Skip to content

Commit b63fe60

Browse files
Merge pull request #51 from travier/docs-update
NO-JIRA: docs: Update for new repo & commands
2 parents 376486f + fcd5149 commit b63fe60

File tree

2 files changed

+19
-39
lines changed

2 files changed

+19
-39
lines changed

docs/development-rhcos.md

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ internal resources.
1111

1212
## Build process
1313

14-
Note that this documentation applies only to RHCOS versions starting with 4.9
15-
and later. For older versions, see the internal documentation.
14+
Note that this documentation applies only to RHCOS versions starting with 4.19
15+
and later. For version from 4.9 to 4.18, see the documentation from
16+
[openshift/os (4.18 branch)](https://github.com/openshift/os/blob/release-4.18/docs/development-rhcos.md).
17+
For versions older than 4.9, see the internal documentation.
1618

1719
- Make sure you're meeting the [prerequisites].
1820

@@ -23,30 +25,16 @@ and later. For older versions, see the internal documentation.
2325
- Note: If you encounter DNS resolution issues with COSA when on the Red Hat
2426
VPN, you should try adding `--net=host` to the podman invocation.
2527

26-
- Always make sure that you are using the *latest build* of the specific
27-
version of the COSA container matching with the version of RHCOS that you
28-
want to build:
29-
```
30-
# Use the latest version for the main developement branch:
31-
# The export command below is optional here as it is the default
32-
$ export COREOS_ASSEMBLER_CONTAINER=quay.io/coreos-assembler/coreos-assembler:latest
33-
$ podman pull quay.io/coreos-assembler/coreos-assembler
34-
35-
# For branched releases:
36-
$ export COREOS_ASSEMBLER_CONTAINER=quay.io/coreos-assembler/coreos-assembler:rhcos-4.10
37-
$ podman pull quay.io/coreos-assembler/coreos-assembler:rhcos-4.10
38-
```
39-
4028
- Create and use a dedicated directory:
4129
```
4230
$ mkdir rhcos
4331
$ cd rhcos
4432
```
45-
If you're going to work on multiple versions of RHCOS, using a dedicated
46-
directory for each version is recommended:
33+
If you're going to work on RHCOS based on different versions of RHEL, using a
34+
dedicated directory for each RHEL version is recommended:
4735
```
48-
$ mkdir rhcos-4.11
49-
$ cd rhcos-4.11
36+
$ mkdir rhcos-rhel-10.1
37+
$ cd rhcos-rhel-10.1
5038
```
5139

5240
- Make sure that you have setup the latest internal Red Hat root certificates
@@ -63,17 +51,18 @@ and later. For older versions, see the internal documentation.
6351
$ export RHCOS_REPO="..."
6452
```
6553

66-
- Clone the config repo (`openshift/os`), passing as argument the internal Git
67-
repo which includes the RPM repo configs and optionaly the specific branch:
54+
- Clone the config repo (`coreos/rhel-coreos-config`), passing as argument the
55+
internal Git repo which includes the RPM repo configs and optionaly the
56+
specific branch:
6857
```
6958
# Main developement branch, default version
70-
$ cosa init --yumrepos "${RHCOS_REPO}" https://github.com/openshift/os.git
59+
$ cosa init --yumrepos "${RHCOS_REPO}" https://github.com/coreos/rhel-coreos-config.git
7160
7261
# Main developement branch, selecting a specific variant
73-
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-9.2 https://github.com/openshift/os.git
62+
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-10.1 https://github.com/coreos/rhel-coreos-config.git
7463
75-
# Specific release branch, selecting a specific variant
76-
$ cosa init --yumrepos "${RHCOS_REPO}" --variant rhel-9.2 --branch release-4.13 https://github.com/openshift/os.git
64+
# 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
7766
```
7867

7968
- Fetch packages and build RHCOS ostree container and QEMU image:
@@ -87,8 +76,8 @@ and later. For older versions, see the internal documentation.
8776
- You can build images for platforms that are supported in COSA using the
8877
[`buildextend` commands][buildextend]:
8978
```
90-
$ cosa buildextend-aws
91-
$ cosa buildextend-openstack
79+
$ cosa osbuild aws
80+
$ cosa osbuild openstack
9281
```
9382

9483
## Running RHCOS locally for testing

docs/development-scos.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@ Fedora CoreOS].
2424
$ cd scos
2525
```
2626

27-
- Clone the config repo (`openshift/os`):
27+
- Clone the config repo (`coreos/rhel-coreos-config`):
2828
```
29-
$ cosa init --variant scos https://github.com/openshift/os.git
30-
```
31-
32-
- **Temporary workaround until we have full repos for SCOS:** Add the internal
33-
`rhel-9-server-ose` repo definition from RHCOS to `rhcos9.repo`:
34-
```
35-
[rhel-9-server-ose]
36-
enabled=1
37-
gpgcheck=0
38-
baseurl=http://...
29+
$ cosa init --variant scos https://github.com/coreos/rhel-coreos-config.git
3930
```
4031

4132
- Fetch packages and build SCOS ostree container and QEMU image:

0 commit comments

Comments
 (0)