Merge pull request #1407 from wking/pin-rhcos

hack/build: Pin to RHCOS 400.7.20190306.0
openshift · Mar 13, 2019 · 37b99d8 · 37b99d8
2 parents 507b62e + bd88157
commit 37b99d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/hack/build.sh b/hack/build.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+RHCOS_BUILD_NAME="${RHCOS_BUILD_NAME:-400.7.20190306.0}"
+
 # shellcheck disable=SC2068
 version() { IFS="."; printf "%03d%03d%03d\\n" $@; unset IFS;}
 

diff --git a/pkg/types/aws/validation/platform.go b/pkg/types/aws/validation/platform.go
@@ -15,25 +15,25 @@ var (
 	Regions = map[string]string{
 		"ap-northeast-1": "Tokyo",
 		"ap-northeast-2": "Seoul",
-		"ap-northeast-3": "Osaka-Local",
+		//"ap-northeast-3": "Osaka-Local",
 		"ap-south-1":     "Mumbai",
 		"ap-southeast-1": "Singapore",
 		"ap-southeast-2": "Sydney",
 		"ca-central-1":   "Central",
-		"cn-north-1":     "Beijing",
-		"cn-northwest-1": "Ningxia",
-		"eu-central-1":   "Frankfurt",
-		"eu-north-1":     "Stockholm",
-		"eu-west-1":      "Ireland",
-		"eu-west-2":      "London",
-		"eu-west-3":      "Paris",
-		"sa-east-1":      "São Paulo",
-		"us-east-1":      "N. Virginia",
-		"us-east-2":      "Ohio",
-		"us-gov-east-1":  "AWS GovCloud (US-East)",
-		"us-gov-west-1":  "AWS GovCloud (US-West)",
-		"us-west-1":      "N. California",
-		"us-west-2":      "Oregon",
+		//"cn-north-1":     "Beijing",
+		//"cn-northwest-1": "Ningxia",
+		"eu-central-1": "Frankfurt",
+		//"eu-north-1":     "Stockholm",
+		"eu-west-1": "Ireland",
+		"eu-west-2": "London",
+		"eu-west-3": "Paris",
+		"sa-east-1": "São Paulo",
+		"us-east-1": "N. Virginia",
+		"us-east-2": "Ohio",
+		//"us-gov-east-1":  "AWS GovCloud (US-East)",
+		//"us-gov-west-1":  "AWS GovCloud (US-West)",
+		"us-west-1": "N. California",
+		"us-west-2": "Oregon",
 	}
 
 	validRegionValues = func() []string {

diff --git a/pkg/types/validation/installconfig_test.go b/pkg/types/validation/installconfig_test.go
@@ -370,7 +370,7 @@ func TestValidateInstallConfig(t *testing.T) {
 				}
 				return c
 			}(),
-			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-north-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-gov-east-1", "us-gov-west-1", "us-west-1", "us-west-2"$`,
+			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"$`,
 		},
 		{
 			name: "valid libvirt platform",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     set -ex
+    RHCOS_BUILD_NAME="${RHCOS_BUILD_NAME:-400.7.20190306.0}"
     # shellcheck disable=SC2068
     version() { IFS="."; printf "%03d%03d%03d\\n" $@; unset IFS;}
@@ Expand Down @@