diff --git a/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-master.yaml index 23f4863d925db..6298b6fe8018a 100644 --- a/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-master.yaml +++ b/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-master.yaml @@ -60,7 +60,7 @@ resources: requests: cpu: 100m memory: 200Mi -rpm_build_commands: tools/build-rpm-rhel8.sh 4.6.0 +rpm_build_commands: tools/build-rpm-rhel8.sh 4.7.0 rpm_build_location: _output/RPMS/noarch tag_specification: name: 4.7-priv diff --git a/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-release-4.7.yaml b/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-release-4.7.yaml index 363b43c535cbc..fff85e8a6e69b 100644 --- a/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/kuryr-kubernetes/openshift-priv-kuryr-kubernetes-release-4.7.yaml @@ -61,7 +61,7 @@ resources: requests: cpu: 100m memory: 200Mi -rpm_build_commands: tools/build-rpm-rhel8.sh 4.6.0 +rpm_build_commands: tools/build-rpm-rhel8.sh 4.7.0 rpm_build_location: _output/RPMS/noarch tag_specification: name: 4.7-priv diff --git a/ci-operator/config/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main.yaml b/ci-operator/config/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main.yaml new file mode 100644 index 0000000000000..06e667832c1fe --- /dev/null +++ b/ci-operator/config/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main.yaml @@ -0,0 +1,45 @@ +base_images: + base: + name: 4.7-priv + namespace: ocp-private + tag: base + openshift_release_golang-1.13: + name: release + namespace: openshift + tag: golang-1.13 +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.13 +canonical_go_repository: github.com/openshift/osd-metrics-exporter +images: +- dockerfile_path: build/Dockerfile + from: base + inputs: + openshift_release_golang-1.13: + as: + - registry.svc.ci.openshift.org/openshift/release:golang-1.13 + to: osd-metrics-exporter +promotion: + name: 4.7-priv + namespace: ocp-private +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tag_specification: + name: 4.7-priv + namespace: ocp-private +tests: +- as: unit + commands: make test + container: + from: src +zz_generated_metadata: + branch: main + org: openshift-priv + repo: osd-metrics-exporter diff --git a/ci-operator/config/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7.yaml b/ci-operator/config/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7.yaml new file mode 100644 index 0000000000000..20d8990d81e5a --- /dev/null +++ b/ci-operator/config/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7.yaml @@ -0,0 +1,46 @@ +base_images: + base: + name: 4.7-priv + namespace: ocp-private + tag: base + openshift_release_golang-1.13: + name: release + namespace: openshift + tag: golang-1.13 +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.13 +canonical_go_repository: github.com/openshift/osd-metrics-exporter +images: +- dockerfile_path: build/Dockerfile + from: base + inputs: + openshift_release_golang-1.13: + as: + - registry.svc.ci.openshift.org/openshift/release:golang-1.13 + to: osd-metrics-exporter +promotion: + disabled: true + name: 4.7-priv + namespace: ocp-private +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tag_specification: + name: 4.7-priv + namespace: ocp-private +tests: +- as: unit + commands: make test + container: + from: src +zz_generated_metadata: + branch: release-4.7 + org: openshift-priv + repo: osd-metrics-exporter diff --git a/ci-operator/config/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7.yaml b/ci-operator/config/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7.yaml new file mode 100644 index 0000000000000..cd767573584b6 --- /dev/null +++ b/ci-operator/config/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7.yaml @@ -0,0 +1,45 @@ +base_images: + base: + name: "4.7" + namespace: ocp + tag: base + openshift_release_golang-1.13: + name: release + namespace: openshift + tag: golang-1.13 +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.13 +images: +- dockerfile_path: build/Dockerfile + from: base + inputs: + openshift_release_golang-1.13: + as: + - registry.svc.ci.openshift.org/openshift/release:golang-1.13 + to: osd-metrics-exporter +promotion: + disabled: true + name: "4.7" + namespace: ocp +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tag_specification: + name: "4.7" + namespace: ocp +tests: +- as: unit + commands: make test + container: + from: src +zz_generated_metadata: + branch: release-4.7 + org: openshift + repo: osd-metrics-exporter diff --git a/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main-postsubmits.yaml b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main-postsubmits.yaml new file mode 100644 index 0000000000000..683a2c6e961c6 --- /dev/null +++ b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main-postsubmits.yaml @@ -0,0 +1,54 @@ +postsubmits: + openshift-priv/osd-metrics-exporter: + - agent: kubernetes + branches: + - ^main$ + cluster: api.ci + decorate: true + decoration_config: + skip_cloning: true + hidden: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/prowgen-controlled: "true" + max_concurrency: 1 + name: branch-ci-openshift-priv-osd-metrics-exporter-main-images + path_alias: github.com/openshift/osd-metrics-exporter + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --promote + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main-presubmits.yaml new file mode 100644 index 0000000000000..78fde9e7237ba --- /dev/null +++ b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-main-presubmits.yaml @@ -0,0 +1,110 @@ +presubmits: + openshift-priv/osd-metrics-exporter: + - agent: kubernetes + always_run: true + branches: + - main + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + hidden: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-osd-metrics-exporter-main-images + path_alias: github.com/openshift/osd-metrics-exporter + rerun_command: /test images + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - main + cluster: build01 + context: ci/prow/unit + decorate: true + decoration_config: + skip_cloning: true + hidden: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-osd-metrics-exporter-main-unit + path_alias: github.com/openshift/osd-metrics-exporter + rerun_command: /test unit + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=unit + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )unit,?($|\s.*) diff --git a/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7-postsubmits.yaml b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7-postsubmits.yaml new file mode 100644 index 0000000000000..25e318925282c --- /dev/null +++ b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7-postsubmits.yaml @@ -0,0 +1,54 @@ +postsubmits: + openshift-priv/osd-metrics-exporter: + - agent: kubernetes + branches: + - ^release-4\.7$ + cluster: api.ci + decorate: true + decoration_config: + skip_cloning: true + hidden: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/prowgen-controlled: "true" + max_concurrency: 1 + name: branch-ci-openshift-priv-osd-metrics-exporter-release-4.7-images + path_alias: github.com/openshift/osd-metrics-exporter + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --promote + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7-presubmits.yaml new file mode 100644 index 0000000000000..b23d9a56dadaf --- /dev/null +++ b/ci-operator/jobs/openshift-priv/osd-metrics-exporter/openshift-priv-osd-metrics-exporter-release-4.7-presubmits.yaml @@ -0,0 +1,110 @@ +presubmits: + openshift-priv/osd-metrics-exporter: + - agent: kubernetes + always_run: true + branches: + - release-4.7 + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + hidden: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-osd-metrics-exporter-release-4.7-images + path_alias: github.com/openshift/osd-metrics-exporter + rerun_command: /test images + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.7 + cluster: build01 + context: ci/prow/unit + decorate: true + decoration_config: + skip_cloning: true + hidden: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-osd-metrics-exporter-release-4.7-unit + path_alias: github.com/openshift/osd-metrics-exporter + rerun_command: /test unit + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=unit + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )unit,?($|\s.*) diff --git a/ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7-postsubmits.yaml b/ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7-postsubmits.yaml new file mode 100644 index 0000000000000..88c0829c70a0f --- /dev/null +++ b/ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7-postsubmits.yaml @@ -0,0 +1,45 @@ +postsubmits: + openshift/osd-metrics-exporter: + - agent: kubernetes + branches: + - ^release-4\.7$ + cluster: api.ci + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/prowgen-controlled: "true" + max_concurrency: 1 + name: branch-ci-openshift-osd-metrics-exporter-release-4.7-images + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --promote + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7-presubmits.yaml new file mode 100644 index 0000000000000..75865696a4e19 --- /dev/null +++ b/ci-operator/jobs/openshift/osd-metrics-exporter/openshift-osd-metrics-exporter-release-4.7-presubmits.yaml @@ -0,0 +1,92 @@ +presubmits: + openshift/osd-metrics-exporter: + - agent: kubernetes + always_run: true + branches: + - release-4.7 + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-osd-metrics-exporter-release-4.7-images + rerun_command: /test images + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.7 + cluster: build01 + context: ci/prow/unit + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-osd-metrics-exporter-release-4.7-unit + rerun_command: /test unit + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=unit + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )unit,?($|\s.*) diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml index 72e4bdbb570f1..19987ffd198de 100644 --- a/core-services/prow/02_config/_config.yaml +++ b/core-services/prow/02_config/_config.yaml @@ -2316,6 +2316,7 @@ tide: - openshift-priv/csi-driver-manila-operator - openshift-priv/debug-network - openshift-priv/kubernetes-nmstate + - openshift-priv/osd-metrics-exporter - openshift-priv/windows-machine-config-bootstrapper - openshift-priv/windows-machine-config-operator - openshift/build-machinery-go @@ -2338,6 +2339,7 @@ tide: - openshift/knative-pkg - openshift/knative-serving - openshift/kubernetes-nmstate + - openshift/osd-metrics-exporter - openshift/pipelines-catalog - openshift/pipelines-tutorial - openshift/release @@ -2352,7 +2354,6 @@ tide: - openshift/tektoncd-triggers - openshift/windows-machine-config-bootstrapper - openshift/windows-machine-config-operator - - openshift/osd-metrics-exporter - labels: - lgtm - approved diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml index ea95243bf8bdf..f5ecb1a7aeb14 100644 --- a/core-services/prow/02_config/_plugins.yaml +++ b/core-services/prow/02_config/_plugins.yaml @@ -319,6 +319,7 @@ approve: require_self_approval: false - commandHelpLink: "" repos: + - openshift-priv/osd-metrics-exporter - openshift/osd-metrics-exporter require_self_approval: false blunderbuss: @@ -2894,6 +2895,7 @@ lgtm: - openshift-priv/must-gather review_acts_as_lgtm: true - repos: + - openshift-priv/osd-metrics-exporter - openshift/osd-metrics-exporter review_acts_as_lgtm: true override: @@ -8899,6 +8901,31 @@ plugins: - verify-owners - wip - yuks + openshift-priv/osd-metrics-exporter: + - approve + - assign + - blunderbuss + - bugzilla + - cat + - dog + - golint + - goose + - heart + - help + - hold + - label + - lgtm + - lifecycle + - override + - owners-label + - pony + - retitle + - shrug + - sigmention + - skip + - verify-owners + - wip + - yuks openshift-priv/osin: - assign - blunderbuss