Skip to content

Commit b9dbde6

Browse files
committed
hack/build: Pin to RHCOS 47.297 and quay.io/openshift-release-dev/ocp-release:4.0.0-0.3
The bump from RHCOS 47.280 to 47.297 brings in, among other things, v0.12 kubelets. Clayton pushed 4.0.0-0.nightly-2019-01-30-145955 to quay.io/openshift-release-dev/ocp-release:4.0.0-0.3. 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.297/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]: containers/podman#2106
1 parent 173930e commit b9dbde6

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-0.3}"
6+
RHCOS_BUILD_NAME="${RELEASE_BUILD_NAME:-47.297}"
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
@@ -145,7 +145,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
145145
}
146146

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

pkg/types/aws/validation/platform.go

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

3636
validRegionValues = func() []string {

pkg/types/validation/installconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func TestValidateInstallConfig(t *testing.T) {
224224
}
225225
return c
226226
}(),
227-
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"$`,
227+
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"$`,
228228
},
229229
{
230230
name: "valid libvirt platform",

0 commit comments

Comments
 (0)