Merge pull request openshift#5952 from smarterclayton/origin_stable

release: Add origin stable for signing and tagging
dmesser · Nov 15, 2019 · dc215b7 · dc215b7
2 parents 3ca4599 + c0addb2
commit dc215b7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -158,19 +158,25 @@ prow-artifacts:
 prow-release-controller-definitions:
 	oc annotate -n ocp is/4.1-art-latest "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.1.json)" --overwrite
 	oc annotate -n ocp is/4.1 "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.1-ci.json)" --overwrite
+
 	oc annotate -n ocp is/4.2-art-latest "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.2.json)" --overwrite
 	oc annotate -n ocp is/4.2-art-latest-s390x "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.2-s390x.json)" --overwrite
 	oc annotate -n ocp is/4.2 "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.2-ci.json)" --overwrite
-	oc annotate -n origin is/4.3 "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-origin-4.3.json)" --overwrite
+
 	oc annotate -n ocp is/4.3-art-latest "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.3.json)" --overwrite
 	oc annotate -n ocp is/4.3-art-latest-s390x "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.3-s390x.json)" --overwrite
 	oc annotate -n ocp is/4.3-art-latest-ppc64le "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.3-ppc64le.json)" --overwrite
 	oc annotate -n ocp is/4.3 "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.3-ci.json)" --overwrite
+
 	oc annotate -n ocp is/4.4-art-latest "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.4.json)" --overwrite
 	oc annotate -n ocp is/4.4-art-latest-s390x "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.4-s390x.json)" --overwrite
 	oc annotate -n ocp is/4.4-art-latest-ppc64le "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.4-ppc64le.json)" --overwrite
 	oc annotate -n ocp is/4.4 "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.4-ci.json)" --overwrite
+
 	oc annotate -n ocp is/release "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-ocp-4.y-stable.json)" --overwrite
+
+	oc annotate -n origin is/4.3 "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-origin-4.3.json)" --overwrite
+	oc annotate -n origin is/release "release.openshift.io/config=$$(cat core-services/release-controller/_releases/release-origin-4.y-stable.json)" --overwrite
 .PHONY: prow-release-controller-definitions
 
 prow-release-controller-deploy:

diff --git a/core-services/release-controller/_releases/release-origin-4.y-stable.json b/core-services/release-controller/_releases/release-origin-4.y-stable.json
@@ -0,0 +1,20 @@
+{
+  "name":"4-stable",
+  "as": "Stable",
+  "message": "All OKD versions are tracked here",
+  "overrideCLIImage": "registry.svc.ci.openshift.org/origin/4.3:cli",
+  "expires":"72h",
+  "pullSecretName": "source",
+  "publish":{},
+  "verify":{
+    "upgrade":{
+      "upgrade":true,
+      "prowJob":{"name":"release-openshift-origin-installer-e2e-aws-upgrade"}
+    },
+    "upgrade-minor":{
+      "upgrade":true,
+      "upgradeFrom": "PreviousMinor",
+      "prowJob":{"name":"release-openshift-origin-installer-e2e-aws-upgrade"}
+    }
+  }
+}