From 2fea190cf559a64fda3947a3c5b5aa0bbbc49901 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Thu, 11 Jun 2026 17:36:51 +0200 Subject: [PATCH 1/6] NO-ISSUE: On-board osac bare-metal-fulfillment-operator --- ...-bare-metal-fulfillment-operator-main.yaml | 32 +++++++ ...fulfillment-operator-main-postsubmits.yaml | 64 +++++++++++++ ...-fulfillment-operator-main-presubmits.yaml | 59 ++++++++++++ .../_pluginconfig.yaml | 90 +++++++++++++++++++ .../_prowconfig.yaml | 14 +++ 5 files changed, 259 insertions(+) create mode 100644 ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml create mode 100644 ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml create mode 100644 ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml create mode 100644 core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_pluginconfig.yaml create mode 100644 core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_prowconfig.yaml diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml new file mode 100644 index 0000000000000..19b98acc0c1d1 --- /dev/null +++ b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml @@ -0,0 +1,32 @@ +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.24-openshift-4.21 +images: + items: + - dockerfile_path: Containerfile + to: bare-metal-fulfillment-operator +promotion: + to: + - excluded_images: + - bare-metal-fulfillment-operator + name: latest + namespace: osac-project +releases: + latest: + candidate: + product: ocp + stream: nightly + version: "4.20" +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: main + org: osac-project + repo: bare-metal-fulfillment-operator diff --git a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml new file mode 100644 index 0000000000000..c81d4efbfe9f5 --- /dev/null +++ b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml @@ -0,0 +1,64 @@ +postsubmits: + osac-project/bare-metal-fulfillment-operator: + - agent: kubernetes + always_run: true + branches: + - ^main$ + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile + labels: + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + job-release: "4.20" + max_concurrency: 1 + name: branch-ci-osac-project-bare-metal-fulfillment-operator-main-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/push-secret + name: push-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml new file mode 100644 index 0000000000000..67fb67ec17304 --- /dev/null +++ b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml @@ -0,0 +1,59 @@ +presubmits: + osac-project/bare-metal-fulfillment-operator: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile + labels: + ci.openshift.io/generator: prowgen + job-release: "4.20" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-osac-project-bare-metal-fulfillment-operator-main-images + rerun_command: /test images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) diff --git a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_pluginconfig.yaml b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_pluginconfig.yaml new file mode 100644 index 0000000000000..4d31d8f2681a6 --- /dev/null +++ b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_pluginconfig.yaml @@ -0,0 +1,90 @@ +approve: +- repos: + - osac-project/bare-metal-fulfillment-operator + require_self_approval: false +external_plugins: + osac-project/bare-metal-fulfillment-operator: + - endpoint: http://refresh + events: + - issue_comment + name: refresh + - endpoint: http://cherrypick + events: + - issue_comment + - pull_request + name: cherrypick + - endpoint: http://needs-rebase + events: + - issue_comment + - pull_request + name: needs-rebase + - endpoint: http://backport-verifier + events: + - issue_comment + - pull_request + name: backport-verifier + - endpoint: http://payload-testing-prow-plugin + events: + - issue_comment + name: payload-testing-prow-plugin + - endpoint: http://jira-lifecycle-plugin + events: + - issue_comment + - pull_request + - pull_request_review + name: jira-lifecycle-plugin + - endpoint: http://pipeline-controller + events: + - pull_request + - issue_comment + name: pipeline-controller + - endpoint: http://multi-pr-prow-plugin + events: + - issue_comment + name: multi-pr-prow-plugin + - endpoint: http://ship-hook + events: + - pull_request + - issue_comment + - pull_request_review + name: ship-hook +lgtm: +- repos: + - osac-project/bare-metal-fulfillment-operator + review_acts_as_lgtm: true +plugins: + osac-project/bare-metal-fulfillment-operator: + plugins: + - assign + - blunderbuss + - cat + - dog + - heart + - golint + - goose + - help + - hold + - jira + - label + - lgtm + - lifecycle + - override + - pony + - retitle + - shrug + - sigmention + - skip + - trigger + - verify-owners + - owners-label + - wip + - yuks + - approve +triggers: +- org_invite: + prominent: {} + repos: + - osac-project/bare-metal-fulfillment-operator + trusted_apps: + - openshift-merge-bot + - dependabot diff --git a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_prowconfig.yaml b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_prowconfig.yaml new file mode 100644 index 0000000000000..19abe5cf16441 --- /dev/null +++ b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/_prowconfig.yaml @@ -0,0 +1,14 @@ +tide: + queries: + - labels: + - approved + - lgtm + missingLabels: + - backports/unvalidated-commits + - do-not-merge/hold + - do-not-merge/invalid-owners-file + - do-not-merge/work-in-progress + - jira/invalid-bug + - needs-rebase + repos: + - osac-project/bare-metal-fulfillment-operator From 14859a8d89bd70ae57f3fe9189ce6efe81a63155 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Thu, 11 Jun 2026 17:45:17 +0200 Subject: [PATCH 2/6] Add OWNERS files --- .../bare-metal-fulfillment-operator/OWNERS | 27 +++++++++++++++++++ .../bare-metal-fulfillment-operator/OWNERS | 27 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS create mode 100644 core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS new file mode 100644 index 0000000000000..462341d33fa90 --- /dev/null +++ b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -0,0 +1,27 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# Fetched from https://github.com/osac-project/osac-operator root OWNERS +# If the repo had OWNERS_ALIASES then the aliases were expanded +# Logins who are not members of 'openshift' organization were filtered out +# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md + +approvers: +- adriengentil +- akshaynadkarni +- danmanor +- eliorerz +- eranco74 +- jhernand +- larsks +- rgolangh +- trewest +options: {} +reviewers: +- adriengentil +- akshaynadkarni +- danmanor +- eliorerz +- eranco74 +- jhernand +- larsks +- rgolangh +- trewest diff --git a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS new file mode 100644 index 0000000000000..462341d33fa90 --- /dev/null +++ b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -0,0 +1,27 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# Fetched from https://github.com/osac-project/osac-operator root OWNERS +# If the repo had OWNERS_ALIASES then the aliases were expanded +# Logins who are not members of 'openshift' organization were filtered out +# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md + +approvers: +- adriengentil +- akshaynadkarni +- danmanor +- eliorerz +- eranco74 +- jhernand +- larsks +- rgolangh +- trewest +options: {} +reviewers: +- adriengentil +- akshaynadkarni +- danmanor +- eliorerz +- eranco74 +- jhernand +- larsks +- rgolangh +- trewest From 1cf029815eb407889eb9d4ed095dfe351761c296 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Thu, 11 Jun 2026 17:49:44 +0200 Subject: [PATCH 3/6] fix promotion --- .../osac-project-bare-metal-fulfillment-operator-main.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml index 19b98acc0c1d1..e187b5848b6bf 100644 --- a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml +++ b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml @@ -7,12 +7,7 @@ images: items: - dockerfile_path: Containerfile to: bare-metal-fulfillment-operator -promotion: - to: - - excluded_images: - - bare-metal-fulfillment-operator - name: latest - namespace: osac-project +promotion: {} releases: latest: candidate: From b06392a281ca03d67614a9dfcbf358036a10d997 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Thu, 11 Jun 2026 18:04:50 +0200 Subject: [PATCH 4/6] Sync OWNERS --- .../bare-metal-fulfillment-operator/OWNERS | 29 +++++-------------- .../bare-metal-fulfillment-operator/OWNERS | 29 +++++-------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS index 462341d33fa90..b9b33727cf3d2 100644 --- a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS +++ b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -1,27 +1,14 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/osac-project/osac-operator root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - approvers: - adriengentil -- akshaynadkarni -- danmanor -- eliorerz -- eranco74 -- jhernand - larsks -- rgolangh -- trewest -options: {} +- tzumainn +- ajamias +- carbonin +- DanNiESh reviewers: - adriengentil -- akshaynadkarni -- danmanor -- eliorerz -- eranco74 -- jhernand - larsks -- rgolangh -- trewest +- tzumainn +- ajamias +- carbonin +- DanNiESh diff --git a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS index 462341d33fa90..b9b33727cf3d2 100644 --- a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS +++ b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -1,27 +1,14 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/osac-project/osac-operator root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - approvers: - adriengentil -- akshaynadkarni -- danmanor -- eliorerz -- eranco74 -- jhernand - larsks -- rgolangh -- trewest -options: {} +- tzumainn +- ajamias +- carbonin +- DanNiESh reviewers: - adriengentil -- akshaynadkarni -- danmanor -- eliorerz -- eranco74 -- jhernand - larsks -- rgolangh -- trewest +- tzumainn +- ajamias +- carbonin +- DanNiESh From 28bf30b7946c14903d1ab44e3aa40f5ee6ef0c88 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Fri, 12 Jun 2026 10:21:10 +0200 Subject: [PATCH 5/6] Remove handles outside of Openshift org --- .../osac-project/bare-metal-fulfillment-operator/OWNERS | 6 ------ .../osac-project/bare-metal-fulfillment-operator/OWNERS | 6 ------ 2 files changed, 12 deletions(-) diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS index b9b33727cf3d2..36ac60f1a631a 100644 --- a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS +++ b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -1,14 +1,8 @@ approvers: - adriengentil - larsks -- tzumainn -- ajamias - carbonin -- DanNiESh reviewers: - adriengentil - larsks -- tzumainn -- ajamias - carbonin -- DanNiESh diff --git a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS index b9b33727cf3d2..36ac60f1a631a 100644 --- a/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS +++ b/core-services/prow/02_config/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -1,14 +1,8 @@ approvers: - adriengentil - larsks -- tzumainn -- ajamias - carbonin -- DanNiESh reviewers: - adriengentil - larsks -- tzumainn -- ajamias - carbonin -- DanNiESh From 21e6b7e77a5682652759612a9d27ff517b3f17f0 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Fri, 12 Jun 2026 14:07:09 +0200 Subject: [PATCH 6/6] Add OWNERS in jobs directory --- .../osac-project/bare-metal-fulfillment-operator/OWNERS | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS diff --git a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS new file mode 100644 index 0000000000000..36ac60f1a631a --- /dev/null +++ b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS @@ -0,0 +1,8 @@ +approvers: +- adriengentil +- larsks +- carbonin +reviewers: +- adriengentil +- larsks +- carbonin