WRKLDS-1251: cli to rhel9

images/openshift-enterprise-cli.yml

@@ -9,27 +9,27 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-8-golang-ci-build-root
+          stream: rhel-9-golang-ci-build-root
 distgit:
-  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: openshift-enterprise-cli-container
   namespace: containers
 enabled_repos:
-- rhel-8-appstream-rpms
-- rhel-8-baseos-rpms
+- rhel-9-appstream-rpms
+- rhel-9-baseos-rpms
 for_payload: true
 from:
   builder:
-  - stream: golang
-  member: openshift-enterprise-base
+  - stream: rhel-9-golang
+  member: openshift-enterprise-base-rhel9
 labels:
   License: GPLv2+
   io.k8s.description: OpenShift is a platform for developing, building, and deploying
     containerized applications.
   io.k8s.display-name: OpenShift Client
   io.openshift.tags: openshift,cli
   vendor: Red Hat
-name: openshift/ose-cli
+name: openshift/ose-cli-rhel9
 payload_name: cli
 owners:
 - aos-master@redhat.com

images/openshift-enterprise-deployer.yml

@@ -8,11 +8,11 @@ content:
       web: https://github.com/openshift/oc
     path: images/deployer
 distgit:
-  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: openshift-enterprise-deployer-container
 enabled_repos:
-- rhel-8-baseos-rpms
-- rhel-8-appstream-rpms
+- rhel-9-baseos-rpms
+- rhel-9-appstream-rpms
 for_payload: true
 from:
   member: openshift-enterprise-cli
@@ -24,7 +24,7 @@ labels:
   io.k8s.display-name: OpenShift Container Platform Deployer
   io.openshift.tags: openshift,deployer
   vendor: Red Hat
-name: openshift/ose-deployer
+name: openshift/ose-deployer-rhel9
 payload_name: deployer
 owners:
 - aos-master@redhat.com

images/ose-cli-artifacts.yml

@@ -9,21 +9,21 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-8-golang-ci-build-root
+          stream: rhel-9-golang-ci-build-root
 distgit:
-  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-cli-artifacts-container
   namespace: containers
 enabled_repos:
-- rhel-8-appstream-rpms
-- rhel-8-baseos-rpms
+- rhel-9-appstream-rpms
+- rhel-9-baseos-rpms
 for_payload: true
 from:
   builder:
   - stream: golang
   - stream: rhel-9-golang
   member: openshift-enterprise-cli
-name: openshift/ose-cli-artifacts
+name: openshift/ose-cli-artifacts-rhel9
 payload_name: cli-artifacts
 owners:
 - ccoleman@redhat.com

images/ose-tools.yml

@@ -9,7 +9,7 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-9-golang-1.21-ci-build-root
+          stream: rhel-9-golang-ci-build-root
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-tools-container
@@ -32,6 +32,4 @@ labels:
 name: openshift/ose-tools-rhel9
 payload_name: tools
 owners:
-- ccoleman@redhat.com
 - aos-master@redhat.com
-canonical_builders_from_upstream: false # member image does not get resolved well