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

Automate config brancher by auto-config-brancher job at Tue, 03 Mar 2026 12:06:47 UTC

Author: openshift-merge-bot[bot]

ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21.yaml

@@ -181,6 +181,25 @@ tests:
     make test-operator-integration
   container:
     from: src
+- always_run: false
+  as: e2e-gcp-operator-encryption-kms
+  optional: true
+  run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption)
+  steps:
+    cluster_profile: gcp
+    env:
+      FEATURE_SET: TechPreviewNoUpgrade
+    test:
+    - as: test
+      cli: latest
+      commands: |
+        make test-e2e-encryption-kms JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+      timeout: 4h0m0s
+    workflow: ipi-gcp
 zz_generated_metadata:
   branch: release-4.21
   org: openshift-priv

ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21.yaml

@@ -437,6 +437,25 @@ tests:
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-cert-rotation-short-azure
+- always_run: false
+  as: e2e-gcp-operator-encryption-kms
+  optional: true
+  run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption)
+  steps:
+    cluster_profile: gcp
+    env:
+      FEATURE_SET: TechPreviewNoUpgrade
+    test:
+    - as: test
+      cli: latest
+      commands: |
+        make test-e2e-encryption-kms JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+      timeout: 4h0m0s
+    workflow: ipi-gcp
 zz_generated_metadata:
   branch: release-4.21
   org: openshift-priv

ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21.yaml

@@ -145,6 +145,25 @@ tests:
       resources:
         requests:
           cpu: 100m
+- always_run: false
+  as: e2e-gcp-operator-encryption-kms
+  optional: true
+  run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption)
+  steps:
+    cluster_profile: gcp
+    env:
+      FEATURE_SET: TechPreviewNoUpgrade
+    test:
+    - as: test
+      cli: latest
+      commands: |
+        make test-e2e-encryption-kms JUNITFILE=${ARTIFACT_DIR}/junit_report.xml --warn-undefined-variables
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+      timeout: 4h0m0s
+    workflow: ipi-gcp
 zz_generated_metadata:
   branch: release-4.21
   org: openshift-priv

ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.19.yaml

@@ -10,25 +10,6 @@ build_root:
     tag: latest
 canonical_go_repository: github.com/openshift/os
 images:
-- dockerfile_literal: |
-    FROM overridden
-    WORKDIR /src
-    # Tell the build scripts that we have setup a directory for unprivileged build
-    ENV COSA_DIR=/tmp/cosa
-    RUN mkdir -p "${COSA_DIR}"
-    # Copy the source code
-    COPY . .
-    # We need to make sure that root can read / write to the COSA_DIR so that
-    # when this container is actually run, we have permissions to read and
-    # write to the COSA_DIR to allow the Kola tests to run.
-    USER root
-    RUN chgrp -Rf root "${COSA_DIR}" && \
-      chmod -Rf g+w "${COSA_DIR}"
-    # Go back to unprivileged user for COSA
-    USER builder
-    WORKDIR /tmp/cosa
-  from: root
-  to: build-image
 - build_args:
   - name: OPENSHIFT_CI
     value: "1"
@@ -50,7 +31,6 @@ images:
 promotion:
   to:
   - excluded_images:
-    - build-image
     - rhel-coreos
     - rhel-coreos-extensions
     name: 4.19-priv
@@ -70,122 +50,7 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-  rhcos-9-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-9-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-9next-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-9next-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-10-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-10-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  scos-9-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  scos-9-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  scos-10-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  scos-10-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
 tests:
-- as: validate
-  commands: ci/prow-entrypoint.sh validate
-  container:
-    from: src
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-9-build-test-qemu
-  commands: /src/ci/prow-entrypoint.sh rhcos-9-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-9-build-test-metal
-  commands: /src/ci/prow-entrypoint.sh rhcos-9-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-9next-build-test-qemu
-  commands: /src/ci/prow-entrypoint.sh rhcos-9next-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-9next-build-test-metal
-  commands: /src/ci/prow-entrypoint.sh rhcos-9next-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: scos-9-build-test-qemu
-  commands: /src/ci/prow-entrypoint.sh scos-9-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: scos-9-build-test-metal
-  commands: /src/ci/prow-entrypoint.sh scos-9-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: scos-10-build-test-qemu
-  commands: /src/ci/prow-entrypoint.sh scos-10-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: scos-10-build-test-metal
-  commands: /src/ci/prow-entrypoint.sh scos-10-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
 - always_run: false
   as: e2e-aws
   optional: true

ci-operator/jobs/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21-presubmits.yaml

@@ -453,6 +453,98 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-console-login,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.21$
+    - ^release-4\.21-
+    cluster: build02
+    context: ci/prow/e2e-gcp-operator-encryption-kms
+    decorate: true
+    decoration_config:
+      oauth_token_secret:
+        key: oauth
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+    hidden: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-priv-cluster-authentication-operator-release-4.21-e2e-gcp-operator-encryption-kms
+    optional: true
+    path_alias: github.com/openshift/cluster-authentication-operator
+    rerun_command: /test e2e-gcp-operator-encryption-kms
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-kms)|^(test/library/encryption)
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --oauth-token-path=/usr/local/github-credentials/oauth
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=e2e-gcp-operator-encryption-kms
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - 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: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - 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( | .* )e2e-gcp-operator-encryption-kms,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: