From 735724bbeb67b8f02b22b3f3ba958d515f9c0079 Mon Sep 17 00:00:00 2001 From: Tommasso Borgato Date: Thu, 22 Jun 2023 16:19:22 +0200 Subject: [PATCH 1/5] Adding repository configuration to onboard https://github.com/xtf-cz/xtf/ --- ci-operator/config/xtf-cz/xtf/OWNERS | 21 ++++++ .../config/xtf-cz/xtf/xtf-cz-xtf-master.yaml | 34 ++++++++++ ci-operator/jobs/xtf-cz/xtf/OWNERS | 21 ++++++ .../xtf/xtf-cz-xtf-master-presubmits.yaml | 65 +++++++++++++++++++ core-services/prow/02_config/_plugins.yaml | 24 +++++++ .../prow/02_config/xtf-cz/xtf/OWNERS | 21 ++++++ .../02_config/xtf-cz/xtf/_pluginconfig.yaml | 4 ++ 7 files changed, 190 insertions(+) create mode 100644 ci-operator/config/xtf-cz/xtf/OWNERS create mode 100644 ci-operator/config/xtf-cz/xtf/xtf-cz-xtf-master.yaml create mode 100644 ci-operator/jobs/xtf-cz/xtf/OWNERS create mode 100644 ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml create mode 100644 core-services/prow/02_config/xtf-cz/xtf/OWNERS create mode 100644 core-services/prow/02_config/xtf-cz/xtf/_pluginconfig.yaml diff --git a/ci-operator/config/xtf-cz/xtf/OWNERS b/ci-operator/config/xtf-cz/xtf/OWNERS new file mode 100644 index 0000000000000..5c859bbff4f92 --- /dev/null +++ b/ci-operator/config/xtf-cz/xtf/OWNERS @@ -0,0 +1,21 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# Fetched from https://github.com/xtf-cz/xtf 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: +- fabiobrz +- tommaso-borgato +- mnovak1 +- istraka +- jbliznak +- simkam +options: {} +reviewers: +- fabiobrz +- tommaso-borgato +- mnovak1 +- istraka +- jbliznak +- simkam diff --git a/ci-operator/config/xtf-cz/xtf/xtf-cz-xtf-master.yaml b/ci-operator/config/xtf-cz/xtf/xtf-cz-xtf-master.yaml new file mode 100644 index 0000000000000..ee6b1edcb9d4c --- /dev/null +++ b/ci-operator/config/xtf-cz/xtf/xtf-cz-xtf-master.yaml @@ -0,0 +1,34 @@ +build_root: + project_image: + dockerfile_path: .ci/openshift-ci/build-root/Dockerfile +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: xtf-e2e + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.12" + steps: + test: + - as: xtf-build + commands: | + ls -la .ci/openshift-ci/build-root/ + /bin/bash .ci/openshift-ci/build-root/e2e-test.sh + from: src + resources: + requests: + cpu: 100m + workflow: generic-claim +zz_generated_metadata: + branch: main + org: xtf-cz + repo: xtf diff --git a/ci-operator/jobs/xtf-cz/xtf/OWNERS b/ci-operator/jobs/xtf-cz/xtf/OWNERS new file mode 100644 index 0000000000000..ec63f4d42ab9b --- /dev/null +++ b/ci-operator/jobs/xtf-cz/xtf/OWNERS @@ -0,0 +1,21 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# Fetched from https://github.com/xtf-cz/xt 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: +- fabiobrz +- tommaso-borgato +- mnovak1 +- istraka +- jbliznak +- simkam +options: {} +reviewers: +- fabiobrz +- tommaso-borgato +- mnovak1 +- istraka +- jbliznak +- simkam diff --git a/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml b/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml new file mode 100644 index 0000000000000..e6241b390c05b --- /dev/null +++ b/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml @@ -0,0 +1,65 @@ +presubmits: + xtf-cz/xtf: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build03 + context: ci/prow/xtf-e2e + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-xtf-cz-xtf-main-xtf-e2e + rerun_command: /test xtf-e2e + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=xtf-e2e + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-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: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )xtf-e2e,?($|\s.*) diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml index 72263c2c09709..ec1b7fe4dcab1 100644 --- a/core-services/prow/02_config/_plugins.yaml +++ b/core-services/prow/02_config/_plugins.yaml @@ -832,6 +832,18 @@ config_updater: - ci gzip: true name: ci-operator-misc-configs + ci-operator/config/Intersmash/intersmash/Intersmash-intersmash-openshift-ci*.yaml: + clusters: + app.ci: + - ci + gzip: true + name: ci-operator-misc-configs + ci-operator/config/xtf-cz/xtf/xtf-cz-xtf-openshift-ci*.yaml: + clusters: + app.ci: + - ci + gzip: true + name: ci-operator-misc-configs ci-operator/config/coreos/**/*-rhcos*.yaml: clusters: app.ci: @@ -1946,6 +1958,18 @@ config_updater: - ci gzip: true name: job-config-misc + ci-operator/jobs/Intersmash/intersmash/Intersmash-intersmash-openshift-ci*.yaml: + clusters: + app.ci: + - ci + gzip: true + name: job-config-misc + ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-openshift-ci*.yaml: + clusters: + app.ci: + - ci + gzip: true + name: job-config-misc ci-operator/jobs/coreos/**/*-rhcos-*.yaml: clusters: app.ci: diff --git a/core-services/prow/02_config/xtf-cz/xtf/OWNERS b/core-services/prow/02_config/xtf-cz/xtf/OWNERS new file mode 100644 index 0000000000000..34174d7052f18 --- /dev/null +++ b/core-services/prow/02_config/xtf-cz/xtf/OWNERS @@ -0,0 +1,21 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# Fetched from https://github.com/Intersmash/intersmash 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: +- fabiobrz +- tommaso-borgato +- mnovak1 +- istraka +- jbliznak +- simkam +options: {} +reviewers: +- fabiobrz +- tommaso-borgato +- mnovak1 +- istraka +- jbliznak +- simkam diff --git a/core-services/prow/02_config/xtf-cz/xtf/_pluginconfig.yaml b/core-services/prow/02_config/xtf-cz/xtf/_pluginconfig.yaml new file mode 100644 index 0000000000000..2a1ec8581fd9b --- /dev/null +++ b/core-services/prow/02_config/xtf-cz/xtf/_pluginconfig.yaml @@ -0,0 +1,4 @@ +plugins: + xtf-cz/xtf: + plugins: + - trigger From 9d016eabca175ec502609fb864e1d8bd78237c2b Mon Sep 17 00:00:00 2001 From: Tommasso Borgato Date: Tue, 1 Aug 2023 19:00:40 +0200 Subject: [PATCH 2/5] Adding repository configuration to onboard https://github.com/xtf-cz/xtf/: xtf is on master --- .../jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml b/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml index e6241b390c05b..a49e603a9f919 100644 --- a/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml +++ b/ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-master-presubmits.yaml @@ -3,8 +3,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^main$ - - ^main- + - ^master$ + - ^master- cluster: build03 context: ci/prow/xtf-e2e decorate: true @@ -13,7 +13,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-xtf-cz-xtf-main-xtf-e2e + name: pull-ci-xtf-cz-xtf-master-xtf-e2e rerun_command: /test xtf-e2e spec: containers: From bf0bb9ebe28ac3fa1814f3f616ac64f1dc8e7bb3 Mon Sep 17 00:00:00 2001 From: Tommasso Borgato Date: Thu, 3 Aug 2023 11:28:40 +0200 Subject: [PATCH 3/5] Adding repository configuration to onboard https://github.com/xtf-cz/xtf/: fix OWNERS --- ci-operator/config/xtf-cz/xtf/OWNERS | 6 ------ ci-operator/jobs/xtf-cz/xtf/OWNERS | 6 ------ core-services/prow/02_config/xtf-cz/xtf/OWNERS | 6 ------ 3 files changed, 18 deletions(-) diff --git a/ci-operator/config/xtf-cz/xtf/OWNERS b/ci-operator/config/xtf-cz/xtf/OWNERS index 5c859bbff4f92..ca8f29de689dd 100644 --- a/ci-operator/config/xtf-cz/xtf/OWNERS +++ b/ci-operator/config/xtf-cz/xtf/OWNERS @@ -7,15 +7,9 @@ approvers: - fabiobrz - tommaso-borgato -- mnovak1 - istraka -- jbliznak -- simkam options: {} reviewers: - fabiobrz - tommaso-borgato -- mnovak1 - istraka -- jbliznak -- simkam diff --git a/ci-operator/jobs/xtf-cz/xtf/OWNERS b/ci-operator/jobs/xtf-cz/xtf/OWNERS index ec63f4d42ab9b..09302d81a7e65 100644 --- a/ci-operator/jobs/xtf-cz/xtf/OWNERS +++ b/ci-operator/jobs/xtf-cz/xtf/OWNERS @@ -7,15 +7,9 @@ approvers: - fabiobrz - tommaso-borgato -- mnovak1 - istraka -- jbliznak -- simkam options: {} reviewers: - fabiobrz - tommaso-borgato -- mnovak1 - istraka -- jbliznak -- simkam diff --git a/core-services/prow/02_config/xtf-cz/xtf/OWNERS b/core-services/prow/02_config/xtf-cz/xtf/OWNERS index 34174d7052f18..374b975d75566 100644 --- a/core-services/prow/02_config/xtf-cz/xtf/OWNERS +++ b/core-services/prow/02_config/xtf-cz/xtf/OWNERS @@ -7,15 +7,9 @@ approvers: - fabiobrz - tommaso-borgato -- mnovak1 - istraka -- jbliznak -- simkam options: {} reviewers: - fabiobrz - tommaso-borgato -- mnovak1 - istraka -- jbliznak -- simkam From 16542d06503866b6ab1b879643983625420fdaca Mon Sep 17 00:00:00 2001 From: Tommasso Borgato Date: Thu, 3 Aug 2023 11:43:40 +0200 Subject: [PATCH 4/5] Adding repository configuration to onboard https://github.com/xtf-cz/xtf/: enable xtf branch openshift-ci.exp --- core-services/prow/02_config/_plugins.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-services/prow/02_config/_plugins.yaml b/core-services/prow/02_config/_plugins.yaml index ec1b7fe4dcab1..62b687590897c 100644 --- a/core-services/prow/02_config/_plugins.yaml +++ b/core-services/prow/02_config/_plugins.yaml @@ -838,7 +838,7 @@ config_updater: - ci gzip: true name: ci-operator-misc-configs - ci-operator/config/xtf-cz/xtf/xtf-cz-xtf-openshift-ci*.yaml: + ci-operator/config/xtf-cz/xtf/*openshift-ci.exp.yaml: clusters: app.ci: - ci @@ -1964,7 +1964,7 @@ config_updater: - ci gzip: true name: job-config-misc - ci-operator/jobs/xtf-cz/xtf/xtf-cz-xtf-openshift-ci*.yaml: + ci-operator/jobs/xtf-cz/xtf/*openshift-ci.exp.yaml: clusters: app.ci: - ci From 1161107a790a286d8a112ebba6cc08391cd52969 Mon Sep 17 00:00:00 2001 From: Tommasso Borgato Date: Fri, 4 Aug 2023 09:08:06 +0200 Subject: [PATCH 5/5] Adding repository configuration to onboard https://github.com/xtf-cz/xtf/: fix OWNERS --- ci-operator/config/xtf-cz/xtf/OWNERS | 2 -- ci-operator/jobs/xtf-cz/xtf/OWNERS | 2 -- core-services/prow/02_config/xtf-cz/xtf/OWNERS | 2 -- 3 files changed, 6 deletions(-) diff --git a/ci-operator/config/xtf-cz/xtf/OWNERS b/ci-operator/config/xtf-cz/xtf/OWNERS index ca8f29de689dd..76bc51dc56b38 100644 --- a/ci-operator/config/xtf-cz/xtf/OWNERS +++ b/ci-operator/config/xtf-cz/xtf/OWNERS @@ -7,9 +7,7 @@ approvers: - fabiobrz - tommaso-borgato -- istraka options: {} reviewers: - fabiobrz - tommaso-borgato -- istraka diff --git a/ci-operator/jobs/xtf-cz/xtf/OWNERS b/ci-operator/jobs/xtf-cz/xtf/OWNERS index 09302d81a7e65..1a70f820b3e95 100644 --- a/ci-operator/jobs/xtf-cz/xtf/OWNERS +++ b/ci-operator/jobs/xtf-cz/xtf/OWNERS @@ -7,9 +7,7 @@ approvers: - fabiobrz - tommaso-borgato -- istraka options: {} reviewers: - fabiobrz - tommaso-borgato -- istraka diff --git a/core-services/prow/02_config/xtf-cz/xtf/OWNERS b/core-services/prow/02_config/xtf-cz/xtf/OWNERS index 374b975d75566..ec9a2b4f8f0ec 100644 --- a/core-services/prow/02_config/xtf-cz/xtf/OWNERS +++ b/core-services/prow/02_config/xtf-cz/xtf/OWNERS @@ -7,9 +7,7 @@ approvers: - fabiobrz - tommaso-borgato -- istraka options: {} reviewers: - fabiobrz - tommaso-borgato -- istraka