From b927cb01bd95e6af1674d238317c03b5d5aa6e15 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Mon, 4 Oct 2021 15:57:08 +0200 Subject: [PATCH 1/4] Add cluster-api-provider-alibaba --- ...ift-cluster-api-provider-alibaba-main.yaml | 26 +++++ ...-api-provider-alibaba-main-presubmits.yaml | 100 ++++++++++++++++++ .../_pluginconfig.yaml | 13 +++ 3 files changed, 139 insertions(+) create mode 100644 ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml create mode 100644 ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml create mode 100644 core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_pluginconfig.yaml diff --git a/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml b/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml new file mode 100644 index 0000000000000..fc6ff38814efc --- /dev/null +++ b/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml @@ -0,0 +1,26 @@ +binary_build_commands: unset VERSION && GOPROXY=off NO_DOCKER=1 make build +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.15 +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: fmt + commands: make fmt + container: + from: src +- as: vet + commands: make vet + container: + from: src +zz_generated_metadata: + branch: main + org: openshift + repo: cluster-api-provider-alibaba diff --git a/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml new file mode 100644 index 0000000000000..a609f0248f07f --- /dev/null +++ b/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml @@ -0,0 +1,100 @@ +presubmits: + openshift/cluster-api-provider-alibaba: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/fmt + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-alibaba-main-fmt + rerun_command: /test fmt + 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=fmt + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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( | .* )fmt,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/vet + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-alibaba-main-vet + rerun_command: /test vet + 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=vet + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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( | .* )vet,?($|\s.*) diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_pluginconfig.yaml new file mode 100644 index 0000000000000..9dbee3dbcf069 --- /dev/null +++ b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_pluginconfig.yaml @@ -0,0 +1,13 @@ +approve: +- commandHelpLink: "" + repos: + - openshift/cluster-api-provider-alibaba + require_self_approval: false +lgtm: +- repos: + - openshift/cluster-api-provider-alibaba + review_acts_as_lgtm: true +plugins: + openshift/cluster-api-provider-alibaba: + plugins: + - approve From 991b6526525f0c91879cff05380d764e2507bb53 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Mon, 4 Oct 2021 16:03:42 +0200 Subject: [PATCH 2/4] Add images job for cluster-api-provider-alibaba --- ...ift-cluster-api-provider-alibaba-main.yaml | 19 ++++++- ...-api-provider-alibaba-main-presubmits.yaml | 49 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml b/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml index fc6ff38814efc..7beacf606e491 100644 --- a/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main.yaml @@ -1,9 +1,26 @@ +base_images: + base: + name: "4.10" + namespace: ocp + tag: base + ocp_builder_rhel-8-golang-1.16-openshift-4.10: + name: builder + namespace: ocp + tag: rhel-8-golang-1.16-openshift-4.10 binary_build_commands: unset VERSION && GOPROXY=off NO_DOCKER=1 make build build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.15 + tag: golang-1.16 +images: +- dockerfile_path: Dockerfile.rhel + from: base + inputs: + ocp_builder_rhel-8-golang-1.16-openshift-4.10: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 + to: alibaba-machine-controllers resources: '*': limits: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml index a609f0248f07f..22b46026201b1 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-alibaba/openshift-cluster-api-provider-alibaba-main-presubmits.yaml @@ -49,6 +49,55 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )fmt,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-alibaba-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: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - 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: From 16a0fdcda72126fda3876ed570ed1c24057ca6a8 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Mon, 4 Oct 2021 16:07:36 +0200 Subject: [PATCH 3/4] Add owners for cluster-api-provider-alibaba --- .../openshift/cluster-api-provider-alibaba/OWNERS | 13 +++++++++++++ .../openshift/cluster-api-provider-alibaba/OWNERS | 13 +++++++++++++ .../openshift/cluster-api-provider-alibaba/OWNERS | 13 +++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 ci-operator/config/openshift/cluster-api-provider-alibaba/OWNERS create mode 100644 ci-operator/jobs/openshift/cluster-api-provider-alibaba/OWNERS create mode 100644 core-services/prow/02_config/openshift/cluster-api-provider-alibaba/OWNERS diff --git a/ci-operator/config/openshift/cluster-api-provider-alibaba/OWNERS b/ci-operator/config/openshift/cluster-api-provider-alibaba/OWNERS new file mode 100644 index 0000000000000..c7bc95f1a562a --- /dev/null +++ b/ci-operator/config/openshift/cluster-api-provider-alibaba/OWNERS @@ -0,0 +1,13 @@ +approvers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik +options: {} +reviewers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik diff --git a/ci-operator/jobs/openshift/cluster-api-provider-alibaba/OWNERS b/ci-operator/jobs/openshift/cluster-api-provider-alibaba/OWNERS new file mode 100644 index 0000000000000..c7bc95f1a562a --- /dev/null +++ b/ci-operator/jobs/openshift/cluster-api-provider-alibaba/OWNERS @@ -0,0 +1,13 @@ +approvers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik +options: {} +reviewers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/OWNERS b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/OWNERS new file mode 100644 index 0000000000000..c7bc95f1a562a --- /dev/null +++ b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/OWNERS @@ -0,0 +1,13 @@ +approvers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik +options: {} +reviewers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik From 2b788ae8e49723015e12c64a3e2fd0ad80d39945 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Mon, 4 Oct 2021 16:11:18 +0200 Subject: [PATCH 4/4] Add prow config for cluster-api-rpovider-alibaba --- .../_prowconfig.yaml | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml new file mode 100644 index 0000000000000..e36efa9a92559 --- /dev/null +++ b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml @@ -0,0 +1,106 @@ +tide: + queries: + - includedBranches: + - community-4.6 + - community-4.7 + - openshift-4.1 + - openshift-4.2 + - openshift-4.3 + - openshift-4.4 + - openshift-4.5 + - openshift-4.6 + - openshift-4.7 + - openshift-4.8 + - release-4.0 + - release-4.1 + - release-4.2 + - release-4.3 + - release-4.4 + - release-4.5 + - release-4.6 + - release-4.7 + - release-4.8 + labels: + - approved + - bugzilla/valid-bug + - cherry-pick-approved + - lgtm + missingLabels: + - backports/unvalidated-commits + - bugzilla/invalid-bug + - do-not-merge/hold + - do-not-merge/invalid-owners-file + - do-not-merge/work-in-progress + - needs-rebase + repos: + - openshift/cluster-api-provider-alibaba + - includedBranches: + - openshift-4.9 + - release-4.9 + labels: + - approved + - bugzilla/valid-bug + - lgtm + - staff-eng-approved + missingLabels: + - backports/unvalidated-commits + - bugzilla/invalid-bug + - do-not-merge/hold + - do-not-merge/invalid-owners-file + - do-not-merge/work-in-progress + - needs-rebase + repos: + - openshift/cluster-api-provider-alibaba + - includedBranches: + - main + - master + labels: + - approved + - lgtm + missingLabels: + - backports/unvalidated-commits + - bugzilla/invalid-bug + - do-not-merge/hold + - do-not-merge/invalid-owners-file + - do-not-merge/work-in-progress + - keep-main-query-separate + - needs-rebase + repos: + - openshift/cluster-api-provider-alibaba + - excludedBranches: + - feature-es6x + - feature-prom-connector + - main + - master + - openshift-4.1 + - openshift-4.2 + - openshift-4.3 + - openshift-4.4 + - openshift-4.5 + - openshift-4.6 + - openshift-4.7 + - openshift-4.8 + - openshift-4.9 + - release-3.11 + - release-4.0 + - release-4.1 + - release-4.2 + - release-4.3 + - release-4.4 + - release-4.5 + - release-4.6 + - release-4.7 + - release-4.8 + - release-4.9 + labels: + - approved + - lgtm + missingLabels: + - backports/unvalidated-commits + - bugzilla/invalid-bug + - do-not-merge/hold + - do-not-merge/invalid-owners-file + - do-not-merge/work-in-progress + - needs-rebase + repos: + - openshift/cluster-api-provider-alibaba