diff --git a/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21.yaml index 96db128bd954f..88e410db6a84c 100644 --- a/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21.yaml +++ b/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 diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21.yaml index 5e03374cd5d84..5e5f411bfe797 100644 --- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21.yaml +++ b/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 diff --git a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21.yaml index 4148636870dcc..e2986523ac1ed 100644 --- a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21.yaml +++ b/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 diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.19.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.19.yaml index 79fff2cde1928..1edd825ef1df7 100644 --- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.19.yaml +++ b/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 diff --git a/ci-operator/jobs/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21-presubmits.yaml index 5890be7a065ed..2c14b802f256a 100644 --- a/ci-operator/jobs/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.21-presubmits.yaml +++ b/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: diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21-presubmits.yaml index a8ba503da40ae..1d8d36e95828d 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21-presubmits.yaml @@ -909,6 +909,98 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-aesgcm,?($|\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-kube-apiserver-operator-release-4.21-e2e-gcp-operator-encryption-kms + optional: true + path_alias: github.com/openshift/cluster-kube-apiserver-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: diff --git a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21-presubmits.yaml index 6445838ef939e..160d7aa8133c6 100644 --- a/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.21-presubmits.yaml @@ -364,6 +364,98 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-aesgcm,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build08 + 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-openshift-apiserver-operator-release-4.21-e2e-gcp-operator-encryption-kms + optional: true + path_alias: github.com/openshift/cluster-openshift-apiserver-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: diff --git a/ci-operator/jobs/openshift-priv/os/openshift-priv-os-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/os/openshift-priv-os-release-4.19-presubmits.yaml index a288a2f53c531..26056769ca59b 100644 --- a/ci-operator/jobs/openshift-priv/os/openshift-priv-os-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/os/openshift-priv-os-release-4.19-presubmits.yaml @@ -156,668 +156,3 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/rhcos-9-build-test-metal - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-rhcos-9-build-test-metal - path_alias: github.com/openshift/os - rerun_command: /test rhcos-9-build-test-metal - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=rhcos-9-build-test-metal - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )rhcos-9-build-test-metal,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/rhcos-9-build-test-qemu - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-rhcos-9-build-test-qemu - path_alias: github.com/openshift/os - rerun_command: /test rhcos-9-build-test-qemu - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=rhcos-9-build-test-qemu - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )rhcos-9-build-test-qemu,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/rhcos-9next-build-test-metal - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-rhcos-9next-build-test-metal - path_alias: github.com/openshift/os - rerun_command: /test rhcos-9next-build-test-metal - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=rhcos-9next-build-test-metal - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )rhcos-9next-build-test-metal,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/rhcos-9next-build-test-qemu - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-rhcos-9next-build-test-qemu - path_alias: github.com/openshift/os - rerun_command: /test rhcos-9next-build-test-qemu - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=rhcos-9next-build-test-qemu - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )rhcos-9next-build-test-qemu,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/scos-10-build-test-metal - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-scos-10-build-test-metal - path_alias: github.com/openshift/os - rerun_command: /test scos-10-build-test-metal - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=scos-10-build-test-metal - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )scos-10-build-test-metal,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/scos-10-build-test-qemu - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-scos-10-build-test-qemu - path_alias: github.com/openshift/os - rerun_command: /test scos-10-build-test-qemu - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=scos-10-build-test-qemu - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )scos-10-build-test-qemu,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/scos-9-build-test-metal - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-scos-9-build-test-metal - path_alias: github.com/openshift/os - rerun_command: /test scos-9-build-test-metal - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=scos-9-build-test-metal - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )scos-9-build-test-metal,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/scos-9-build-test-qemu - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - devices.kubevirt.io/kvm: "1" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-scos-9-build-test-qemu - path_alias: github.com/openshift/os - rerun_command: /test scos-9-build-test-qemu - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=scos-9-build-test-qemu - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )scos-9-build-test-qemu,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build04 - context: ci/prow/validate - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-os-release-4.19-validate - path_alias: github.com/openshift/os - rerun_command: /test validate - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - 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=validate - 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: /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: 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 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )validate,?($|\s.*) diff --git a/clusters/hosted-mgmt/hive/pools/ci-tools/fake-ocp-4-18-multi-aws_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/ci-tools/fake-ocp-4-18-multi-aws_clusterpool.yaml index fd30f2aba867c..59d8ab714aa43 100644 --- a/clusters/hosted-mgmt/hive/pools/ci-tools/fake-ocp-4-18-multi-aws_clusterpool.yaml +++ b/clusters/hosted-mgmt/hive/pools/ci-tools/fake-ocp-4-18-multi-aws_clusterpool.yaml @@ -16,8 +16,9 @@ spec: annotations: hive.openshift.io/fake-cluster: "true" baseDomain: hive.aws.ci.openshift.org + hibernationConfig: null imageSetRef: - name: ocp-release-4.18.34-multi-for-4.18.0-0-to-4.19.0-0 + name: ocp-release-4.18.34-x86-64-for-4.18.0-0-to-4.19.0-0 installConfigSecretTemplateRef: name: fake-install-config labels: diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.50-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.50-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml index 911d40175c3c5..485c30d38f527 100644 --- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.50-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml +++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.50-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml @@ -3,6 +3,7 @@ kind: ClusterImageSet metadata: annotations: version_lower: 4.17.0-0 + version_stream: 4-stable version_upper: 4.18.0-0 creationTimestamp: null name: ocp-release-4.17.50-x86-64-for-4.17.0-0-to-4.18.0-0 diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.34-multi-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.34-multi-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml deleted file mode 100644 index 76961fbf461ce..0000000000000 --- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.34-multi-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: hive.openshift.io/v1 -kind: ClusterImageSet -metadata: - annotations: - version_lower: 4.18.0-0 - version_upper: 4.19.0-0 - creationTimestamp: null - name: ocp-release-4.18.34-multi-for-4.18.0-0-to-4.19.0-0 -spec: - releaseImage: quay.io/openshift-release-dev/ocp-release:4.18.34-multi -status: {} diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.19.25-x86-64-for-4.19.0-0-to-4.20.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.19.25-x86-64-for-4.19.0-0-to-4.20.0-0_clusterimageset.yaml index bc22e45a5df11..ebf846eb4e358 100644 --- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.19.25-x86-64-for-4.19.0-0-to-4.20.0-0_clusterimageset.yaml +++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.19.25-x86-64-for-4.19.0-0-to-4.20.0-0_clusterimageset.yaml @@ -3,7 +3,6 @@ kind: ClusterImageSet metadata: annotations: version_lower: 4.19.0-0 - version_stream: 4-stable version_upper: 4.20.0-0 creationTimestamp: null name: ocp-release-4.19.25-x86-64-for-4.19.0-0-to-4.20.0-0 diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.20.15-x86-64-for-4.20.0-0-to-4.21.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.20.15-x86-64-for-4.20.0-0-to-4.21.0-0_clusterimageset.yaml index 6440cd4c6da66..6cfa986b47d2d 100644 --- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.20.15-x86-64-for-4.20.0-0-to-4.21.0-0_clusterimageset.yaml +++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.20.15-x86-64-for-4.20.0-0-to-4.21.0-0_clusterimageset.yaml @@ -3,6 +3,7 @@ kind: ClusterImageSet metadata: annotations: version_lower: 4.20.0-0 + version_stream: 4-stable version_upper: 4.21.0-0 creationTimestamp: null name: ocp-release-4.20.15-x86-64-for-4.20.0-0-to-4.21.0-0