Skip to content

Commit

Permalink
Merge pull request coreos#499 from miabbott/master_is_4.8
Browse files Browse the repository at this point in the history
updates for OCP 4.8
  • Loading branch information
openshift-merge-robot authored Feb 9, 2021
2 parents 3b8f9ff + e31c501 commit e8914e2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ci/build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export COSA_SKIP_OVERLAY=1
gitdir=$(pwd)
cd $(mktemp -d)
cosa init ${gitdir}
# TODO query the 4-7 bits from manifest.yaml or so
curl -L http://base-4-7-rhel8.ocp.svc.cluster.local > src/config/ocp.repo
# TODO query the 4-8 bits from manifest.yaml or so
curl -L http://base-4-8-rhel8.ocp.svc.cluster.local > src/config/ocp.repo
cosa fetch
cosa build
cosa kola --basic-qemu-scenarios
Expand Down
2 changes: 1 addition & 1 deletion docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ See https://github.com/openshift/release/blob/master/core-services/release-contr
Use this:
```
$ cosa init https://github.com/openshift/os
$ curl -L http://base-4-7-rhel8.ocp.svc.cluster.local > src/config/ocp.repo
$ curl -L http://base-4-8-rhel8.ocp.svc.cluster.local > src/config/ocp.repo
```
4 changes: 2 additions & 2 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ repos:
- rhel-8-server-ose

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "47.83.<date:%Y%m%d%H%M>"
automatic-version-prefix: "48.83.<date:%Y%m%d%H%M>"
# This ensures we're semver-compatible which OpenShift wants
automatic-version-suffix: "-"
mutate-os-release: "4.7"
mutate-os-release: "4.8"

documentation: false
initramfs-args:
Expand Down

0 comments on commit e8914e2

Please sign in to comment.