Merge pull request #44643 from openshift-bot/auto-config-brancher

Automate config brancher by auto-config-brancher job at Fri, 20 Oct 2023 08:06:20 UTC
openshift · Oct 20, 2023 · d2b26fc · d2b26fc
2 parents cdf0b67 + a2069ba
commit d2b26fc
Show file tree

Hide file tree

Showing 34 changed files with 1,085 additions and 7 deletions.
diff --git a/...manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master.yaml b/...manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-master.yaml
@@ -81,6 +81,12 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: master
   org: openshift-priv

diff --git a/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.11.yaml b/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.11.yaml
@@ -79,6 +79,12 @@ tests:
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-builds-techpreview
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.11
   org: openshift-priv

diff --git a/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12.yaml b/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.12.yaml
@@ -81,6 +81,12 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv

diff --git a/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13.yaml b/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.13.yaml
@@ -81,6 +81,12 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv

diff --git a/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.14.yaml b/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.14.yaml
@@ -81,6 +81,12 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.14
   org: openshift-priv

diff --git a/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.15.yaml b/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.15.yaml
@@ -82,6 +82,12 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.15
   org: openshift-priv

diff --git a/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.16.yaml b/...r-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.16.yaml
@@ -81,6 +81,12 @@ tests:
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.16
   org: openshift-priv

diff --git a/...priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master.yaml b/...priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-master.yaml
@@ -90,6 +90,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: master
   org: openshift-priv

diff --git a/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.11.yaml b/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.11.yaml
@@ -88,6 +88,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.11
   org: openshift-priv

diff --git a/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12.yaml b/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.12.yaml
@@ -90,6 +90,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.12
   org: openshift-priv

diff --git a/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13.yaml b/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.13.yaml
@@ -90,6 +90,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.13
   org: openshift-priv

diff --git a/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.14.yaml b/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.14.yaml
@@ -90,6 +90,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.14
   org: openshift-priv

diff --git a/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.15.yaml b/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.15.yaml
@@ -91,6 +91,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.15
   org: openshift-priv

diff --git a/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.16.yaml b/...penshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.16.yaml
@@ -90,6 +90,12 @@ tests:
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp-builds
+- as: security
+  optional: true
+  steps:
+    env:
+      PROJECT_NAME: openshift-controller-manager
+    workflow: openshift-ci-security
 zz_generated_metadata:
   branch: release-4.16
   org: openshift-priv

diff --git a/...rator/openshift-priv-cluster-openshift-controller-manager-operator-master-presubmits.yaml b/...rator/openshift-priv-cluster-openshift-controller-manager-operator-master-presubmits.yaml
@@ -420,6 +420,77 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )openshift-e2e-aws-builds-techpreview,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/security
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-master-security
+    optional: true
+    path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
+    rerun_command: /test security
+    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
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=security
+        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: /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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - 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( | .* )security,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

diff --git a/...openshift-priv-cluster-openshift-controller-manager-operator-release-4.11-presubmits.yaml b/...openshift-priv-cluster-openshift-controller-manager-operator-release-4.11-presubmits.yaml
@@ -420,6 +420,77 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )openshift-e2e-aws-builds-techpreview,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.11$
+    - ^release-4\.11-
+    cluster: build01
+    context: ci/prow/security
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-openshift-controller-manager-operator-release-4.11-security
+    optional: true
+    path_alias: github.com/openshift/cluster-openshift-controller-manager-operator
+    rerun_command: /test security
+    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
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=security
+        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: /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: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - 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( | .* )security,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: