Skip to content

Commit b6ee45c

Browse files
committed
hack/build: Pin to RHCOS 47.245 and quay.io/openshift-release-dev/ocp-release:4.0.0-9
That's almost 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.246", "timestamp": "2019-01-05T23:11:19Z" } I'm going with 47.245, because it's been selected as the likely build for the next OpenShift release. Clayton just pushed 4.0.0-0.alpha-2019-01-04-235315 to quay.io/openshift-release-dev/ocp-release:4.0.0-9. 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). Also comment out regions which this particular RHCOS build wasn't pushed to, leaving only: $ curl -s https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/47.246/meta.json | jq -r '.amis[] | .name' ap-northeast-1 ap-northeast-2 ap-south-1 ap-southeast-1 ap-southeast-2 ca-central-1 eu-central-1 eu-west-1 eu-west-2 eu-west-3 sa-east-1 us-east-1 us-east-2 us-west-1 us-west-2 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.
1 parent 9cce8c3 commit b6ee45c

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

hack/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
set -ex
44

5+
RELEASE_IMAGE="${RELEASE_IMAGE:-quay.io/openshift-release-dev/ocp-release:4.0.0-9}"
6+
RHCOS_BUILD_NAME="${RELEASE_BUILD_NAME:-47.245}"
7+
58
# shellcheck disable=SC2068
69
version() { IFS="."; printf "%03d%03d%03d\\n" $@; unset IFS;}
710

pkg/asset/ignition/bootstrap/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
144144
}
145145

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

pkg/types/aws/validation/platform.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ var (
1616
Regions = map[string]string{
1717
"ap-northeast-1": "Tokyo",
1818
"ap-northeast-2": "Seoul",
19-
"ap-northeast-3": "Osaka-Local",
19+
//"ap-northeast-3": "Osaka-Local",
2020
"ap-south-1": "Mumbai",
2121
"ap-southeast-1": "Singapore",
2222
"ap-southeast-2": "Sydney",
2323
"ca-central-1": "Central",
24-
"cn-north-1": "Beijing",
25-
"cn-northwest-1": "Ningxia",
26-
"eu-central-1": "Frankfurt",
27-
"eu-west-1": "Ireland",
28-
"eu-west-2": "London",
29-
"eu-west-3": "Paris",
30-
"sa-east-1": "São Paulo",
31-
"us-east-1": "N. Virginia",
32-
"us-east-2": "Ohio",
33-
"us-west-1": "N. California",
34-
"us-west-2": "Oregon",
24+
//"cn-north-1": "Beijing",
25+
//"cn-northwest-1": "Ningxia",
26+
"eu-central-1": "Frankfurt",
27+
"eu-west-1": "Ireland",
28+
"eu-west-2": "London",
29+
"eu-west-3": "Paris",
30+
"sa-east-1": "São Paulo",
31+
"us-east-1": "N. Virginia",
32+
"us-east-2": "Ohio",
33+
"us-west-1": "N. California",
34+
"us-west-2": "Oregon",
3535
}
3636

3737
validRegionValues = func() []string {

pkg/types/validation/installconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func TestValidateInstallConfig(t *testing.T) {
217217
}
218218
return c
219219
}(),
220-
expectedError: `^platform\.aws\.region: Unsupported value: "": supported values: "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "cn-north-1", "cn-northwest-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"$`,
220+
expectedError: `^platform\.aws\.region: Unsupported value: "": supported values: "ap-northeast-1", "ap-northeast-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"$`,
221221
},
222222
{
223223
name: "valid libvirt platform",

0 commit comments

Comments
 (0)