Skip to content

Commit

Permalink
hack/build: Pin to RHCOS 47.212 and quay.io/openshift-release-dev/ocp…
Browse files Browse the repository at this point in the history
…-release:4.0.0-6

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.212",
    "timestamp": "2018-12-14T23:43:06Z"
  }

And Clayton just pushed 4.0.0-0.alpha-2018-12-13-230701 to
quay.io/openshift-release-dev/ocp-release:4.0.0-6.

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).

I'd initially expected to export the pinning environment variables in
release.sh, but I've put them in build.sh here because our continuous
integration tests use build.sh directly and don't go through
release.sh.
  • Loading branch information
wking committed Dec 15, 2018
1 parent 04dda38 commit 17ffd16
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

set -ex

RELEASE_IMAGE="${RELEASE_IMAGE:-quay.io/openshift-release-dev/ocp-release:4.0.0-6}"
RHCOS_BUILD_NAME="${RELEASE_BUILD_NAME:-47.212}"

# shellcheck disable=SC2068
version() { IFS="."; printf "%03d%03d%03d\\n" $@; unset IFS;}

Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/ignition/bootstrap/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
}

releaseImage := defaultReleaseImage
if ri, ok := os.LookupEnv("OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE"); ok && ri != "" {
if ri, ok := os.LookupEnv("_OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE"); ok && ri != "" {
logrus.Warn("Found override for ReleaseImage. Please be warned, this is not advised")
releaseImage = ri
}
Expand Down

0 comments on commit 17ffd16

Please sign in to comment.