From 857b1a3bd5a751c71db7ca722e33009d8d3d0b6c Mon Sep 17 00:00:00 2001 From: Amanda Hager Lopes de Andrade Katz Date: Mon, 13 Jul 2026 15:52:27 -0300 Subject: [PATCH] ROSAENG-61450: wire rosa-clients for openshift/rosa CI Depends on openshift/rosa#3366 (Dockerfile.clients + .ci-operator.yaml). Switch rosa ci-operator configs to build_root from_repository, run presubmits from rosa-clients, and regenerate prow jobs. Stop skipping jobs when only .ci-operator.yaml changes now that build_root uses from_repository: true. Signed-off-by: Amanda Hager Lopes de Andrade Katz Co-authored-by: Cursor --- .../openshift/rosa/openshift-rosa-master.yaml | 43 ++-- ...openshift-rosa-master__e2e-presubmits.yaml | 5 +- .../rosa/openshift-rosa-master__e2e.yaml | 5 +- ...openshift-rosa-master__images-release.yaml | 5 +- .../rosa/openshift-rosa-master__images.yaml | 5 +- .../rosa/openshift-rosa-master-periodics.yaml | 220 +++++++++++------- .../openshift-rosa-master-postsubmits.yaml | 12 +- .../openshift-rosa-master-presubmits.yaml | 159 ++++++++++--- 8 files changed, 296 insertions(+), 158 deletions(-) diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml index 9fc7a5eb7ddf7..15c54fc3c1960 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml @@ -1,13 +1,10 @@ -base_images: - base: - name: ubi - namespace: ocp - tag: "9" build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.23 + from_repository: true +images: + items: + - dockerfile_path: Dockerfile.clients + to: rosa-clients + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) prowgen: expose: true private: true @@ -23,50 +20,50 @@ tests: unset GOFLAGS make lint container: - from: src - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + from: rosa-clients + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) - as: build commands: | unset GOFLAGS make container: - from: src - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + from: rosa-clients + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) - as: test commands: | make test verify container: - from: src - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + from: rosa-clients + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) - as: commits commands: | make commits/check container: - from: src - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + from: rosa-clients + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) - as: coverage commands: | export CODECOV_TOKEN=$(cat /tmp/secret/CODECOV_TOKEN) make codecov container: - from: src + from: rosa-clients secret: mount_path: /tmp/secret name: rosa-codecov-token - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) - as: publish-coverage commands: | export CODECOV_TOKEN=$(cat /tmp/secret/CODECOV_TOKEN) make codecov container: - from: src + from: rosa-clients postsubmit: true secret: mount_path: /tmp/secret name: rosa-codecov-token - as: security optional: true - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) steps: env: PROJECT_NAME: rosa @@ -77,9 +74,9 @@ tests: unset GOFLAGS make govulncheck container: - from: src + from: rosa-clients optional: true - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e-presubmits.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e-presubmits.yaml index 157c23265aa3f..9186e357b7150 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e-presubmits.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e-presubmits.yaml @@ -4,10 +4,7 @@ base_images: namespace: origin tag: cli build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.23 + from_repository: true images: items: - dockerfile_path: images/Dockerfile.e2e diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml index 3378954858b87..432eb9b1bb3f6 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml @@ -4,10 +4,7 @@ base_images: namespace: ci tag: latest build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.26-openshift-4.23 + from_repository: true prowgen: expose: true private: true diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master__images-release.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master__images-release.yaml index 88b6e95246078..acac149bfa2e1 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master__images-release.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master__images-release.yaml @@ -4,10 +4,7 @@ base_images: namespace: origin tag: cli build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.23 + from_repository: true images: items: - dockerfile_path: images/Dockerfile.release diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master__images.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master__images.yaml index 9e60f403528ab..5356b4e96f4e5 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master__images.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master__images.yaml @@ -4,10 +4,7 @@ base_images: namespace: origin tag: cli build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.23 + from_repository: true images: items: - dockerfile_path: images/Dockerfile.e2e diff --git a/ci-operator/jobs/openshift/rosa/openshift-rosa-master-periodics.yaml b/ci-operator/jobs/openshift/rosa/openshift-rosa-master-periodics.yaml index 854f537d7912d..b09b517c293e8 100644 --- a/ci-operator/jobs/openshift/rosa/openshift-rosa-master-periodics.yaml +++ b/ci-operator/jobs/openshift/rosa/openshift-rosa-master-periodics.yaml @@ -4,11 +4,17 @@ periodics: cron: 21 12 6,13,20,29 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -88,9 +94,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -105,11 +108,17 @@ periodics: cron: 15 23 3,6,9,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -189,9 +198,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -206,11 +212,17 @@ periodics: cron: 29 17 1,4,7,10,13,16,19,22,25,28 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -290,9 +302,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -307,11 +316,17 @@ periodics: cron: 53 17 3,6,8,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -391,9 +406,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -408,11 +420,17 @@ periodics: cron: 12 0 9,16,23,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -492,9 +510,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -509,11 +524,17 @@ periodics: cron: 31 15 1,4,7,10,13,16,19,22,25,28 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -593,9 +614,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -610,11 +628,17 @@ periodics: cron: 27 19 2,5,8,11,14,17,20,23,26,29 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -694,9 +718,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -711,11 +732,17 @@ periodics: cron: 0 0 1,4,7,10,13,16,19,22,25,28 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -795,9 +822,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -812,11 +836,17 @@ periodics: cron: 42 1 1,4,7,10,13,16,19,22,25,28 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -896,9 +926,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -913,11 +940,17 @@ periodics: cron: 53 12 3,6,9,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -997,9 +1030,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1014,11 +1044,17 @@ periodics: cron: 6 6 3,6,9,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1098,9 +1134,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1115,11 +1148,17 @@ periodics: cron: 21 12 6,13,20,29 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1199,9 +1238,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1216,11 +1252,17 @@ periodics: cron: 24 19 2,5,8,11,14,17,20,23,26,29 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1300,9 +1342,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1317,11 +1356,17 @@ periodics: cron: 34 13 3,6,9,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1401,9 +1446,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1418,11 +1460,17 @@ periodics: cron: 3 18 13,29 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1502,9 +1550,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1519,11 +1564,17 @@ periodics: cron: 27 23 3,6,9,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1603,9 +1654,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1620,11 +1668,17 @@ periodics: cron: 59 0 1,4,7,10,13,16,19,22,25,28 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1704,9 +1758,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1721,11 +1772,17 @@ periodics: cron: 0 0 1,4,7,10,13,16,19,22,25,28 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1805,9 +1862,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1822,11 +1876,17 @@ periodics: cron: 26 16 2,5,8,11,14,17,20,23,26,29 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -1906,9 +1966,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1923,11 +1980,17 @@ periodics: cron: 32 18 3,6,9,12,15,18,21,24,27,30 * * decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml extra_refs: - base_ref: master org: openshift repo: rosa + sparse_checkout_files: + - .ci-operator.yaml labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: oex-aws-qe @@ -2007,9 +2070,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/openshift/rosa/openshift-rosa-master-postsubmits.yaml b/ci-operator/jobs/openshift/rosa/openshift-rosa-master-postsubmits.yaml index 5c01c3d0e055e..22c341df926d0 100644 --- a/ci-operator/jobs/openshift/rosa/openshift-rosa-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/rosa/openshift-rosa-master-postsubmits.yaml @@ -11,6 +11,7 @@ postsubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/is-promotion: "true" @@ -81,6 +82,7 @@ postsubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.release labels: ci-operator.openshift.io/is-promotion: "true" @@ -147,7 +149,12 @@ postsubmits: cluster: build06 decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen max_concurrency: 1 @@ -198,9 +205,6 @@ postsubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/openshift/rosa/openshift-rosa-master-presubmits.yaml b/ci-operator/jobs/openshift/rosa/openshift-rosa-master-presubmits.yaml index e7728022b9908..862ada8846c1a 100644 --- a/ci-operator/jobs/openshift/rosa/openshift-rosa-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/rosa/openshift-rosa-master-presubmits.yaml @@ -9,13 +9,18 @@ presubmits: context: ci/prow/build decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-build rerun_command: /test build - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) spec: containers: - args: @@ -58,9 +63,6 @@ presubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -80,13 +82,18 @@ presubmits: context: ci/prow/commits decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-commits rerun_command: /test commits - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) spec: containers: - args: @@ -129,9 +136,6 @@ presubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -151,13 +155,18 @@ presubmits: context: ci/prow/coverage decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-coverage rerun_command: /test coverage - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) skip_report: true spec: containers: @@ -205,9 +214,6 @@ presubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -234,6 +240,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/variant: e2e-presubmits @@ -299,6 +306,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e timeout: 6h0m0s labels: @@ -394,6 +402,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/cloud: aws @@ -487,6 +496,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/cloud: aws @@ -580,6 +590,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/cloud: aws @@ -673,6 +684,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e timeout: 6h0m0s labels: @@ -768,6 +780,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/cloud: aws @@ -861,6 +874,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/cloud: aws @@ -950,14 +964,19 @@ presubmits: context: ci/prow/govulncheck decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-govulncheck optional: true rerun_command: /test govulncheck - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) spec: containers: - args: @@ -1000,9 +1019,6 @@ presubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1013,6 +1029,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )govulncheck,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build03 + context: ci/prow/images + decorate: true + decoration_config: + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-rosa-master-images + rerun_command: /test images + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --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: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + 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.*) - agent: kubernetes always_run: true branches: @@ -1026,6 +1107,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.e2e labels: ci-operator.openshift.io/variant: images @@ -1091,6 +1173,7 @@ presubmits: key: oauth name: github-credentials-openshift-ci-robot-private-git-cloner sparse_checkout_files: + - .ci-operator.yaml - images/Dockerfile.release labels: ci-operator.openshift.io/variant: images-release @@ -1152,13 +1235,18 @@ presubmits: context: ci/prow/lint decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-lint rerun_command: /test lint - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) spec: containers: - args: @@ -1201,9 +1289,6 @@ presubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1223,14 +1308,19 @@ presubmits: context: ci/prow/security decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-security optional: true rerun_command: /test security - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) spec: containers: - args: @@ -1283,9 +1373,6 @@ presubmits: - key: credentials path: credentials secretName: boskos-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1305,13 +1392,18 @@ presubmits: context: ci/prow/test decorate: true decoration_config: - skip_cloning: true + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.clients labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-rosa-master-test rerun_command: /test test - skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton)(?:/|$) + skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|renovate\.json)$|^(?:docs|\.github|\.tekton)(?:/|$) spec: containers: - args: @@ -1354,9 +1446,6 @@ presubmits: 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: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher