Skip to content

Commit 3b3e376

Browse files
committed
pkg: Pin to RHCOS 47.198 and quay.io/openshift-release-dev/ocp-release:4.0.0-4
That's the latest RHCOS release: $ curl -s https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/builds.json | jq '{latest: .builds[0], timestamp}' { "latest": "47.198", "timestamp": "2018-12-08T23:13:22Z" } And Clayton just pushed 4.0.0-alpha.0-2018-12-07-090414 to quay.io/openshift-release-dev/ocp-release:4.0.0-4. That's not the most recent release, but it's the most-recent stable release ;). Renaming OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE gets us CI testing of the pinned release despite openshift/release@60007df2 (Use RELEASE_IMAGE_LATEST for CVO payload, 2018-10-03, openshift/release#1793).
1 parent 819ecb3 commit 3b3e376

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

pkg/asset/ignition/bootstrap/bootstrap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
const (
3232
rootDir = "/opt/openshift"
33-
defaultReleaseImage = "registry.svc.ci.openshift.org/openshift/origin-release:v4.0"
33+
defaultReleaseImage = "quay.io/openshift-release-dev/ocp-release:4.0.0-4"
3434
bootstrapIgnFilename = "bootstrap.ign"
3535
)
3636

@@ -141,7 +141,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig, adminKub
141141
}
142142

143143
releaseImage := defaultReleaseImage
144-
if ri, ok := os.LookupEnv("OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE"); ok && ri != "" {
144+
if ri, ok := os.LookupEnv("_OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE"); ok && ri != "" {
145145
logrus.Warn("Found override for ReleaseImage. Please be warned, this is not advised")
146146
releaseImage = ri
147147
}

pkg/rhcos/builds.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,15 @@ type metadata struct {
3333
}
3434

3535
func fetchLatestMetadata(ctx context.Context, channel string) (metadata, error) {
36-
build, err := fetchLatestBuild(ctx, channel)
37-
if err != nil {
38-
return metadata{}, errors.Wrap(err, "failed to fetch latest build")
36+
var build string
37+
var err error
38+
if channel == DefaultChannel {
39+
build = "47.198"
40+
} else {
41+
build, err = fetchLatestBuild(ctx, channel)
42+
if err != nil {
43+
return metadata{}, errors.Wrap(err, "failed to fetch latest build")
44+
}
3945
}
4046

4147
url := fmt.Sprintf("%s/%s/%s/meta.json", baseURL, channel, build)

0 commit comments

Comments
 (0)