diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml index f84754396653f..7a787926a5402 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml @@ -48,6 +48,49 @@ resources: cpu: 100m memory: 200Mi tests: +- as: jenkins-check-plugins-supply-chain-change-techpreview-rhcos10 + commands: hack/check-plugins-supply-chain-change.sh + container: + clone: true + from: ocp_builder_rhel-8-golang-1.20-openshift-4.15 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ +- as: e2e-jenkins-image-tests-techpreview-rhcos10 + commands: IMAGE_NAME=stable:jenkins make smoke + container: + clone: true + from: ocp_builder_rhel-8-golang-1.20-openshift-4.15 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ +- as: e2e-aws-techpreview-rhcos10 + optional: true + steps: + cluster_profile: openshift-org-aws + env: + EXTRA_MG_ARGS: --host-network + FEATURE_SET: TechPreviewNoUpgrade + OSSTREAM: rhel-10 + workflow: openshift-e2e-aws +- as: e2e-aws-jenkins-sync-plugin-techpreview-rhcos10 + optional: true + steps: + cluster_profile: openshift-org-aws + env: + EXTRA_MG_ARGS: --host-network + FEATURE_SET: TechPreviewNoUpgrade + OSSTREAM: rhel-10 + test: + - ref: jenkins-sync-plugin-e2e + workflow: ipi-aws +- as: e2e-aws-jenkins-client-plugin-techpreview-rhcos10 + optional: true + steps: + cluster_profile: openshift-org-aws + env: + EXTRA_MG_ARGS: --host-network + FEATURE_SET: TechPreviewNoUpgrade + OSSTREAM: rhel-10 + test: + - ref: jenkins-client-plugin-tests + workflow: ipi-aws - as: jenkins-check-plugins-supply-chain-change commands: hack/check-plugins-supply-chain-change.sh container: diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml index 07d7e677923d9..2844f0e1dd3b5 100644 --- a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml @@ -162,6 +162,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-jenkins-client-plugin,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/e2e-aws-jenkins-client-plugin-techpreview-rhcos10 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-jenkins-master-e2e-aws-jenkins-client-plugin-techpreview-rhcos10 + optional: true + rerun_command: /test e2e-aws-jenkins-client-plugin-techpreview-rhcos10 + 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 + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-jenkins-client-plugin-techpreview-rhcos10 + 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: /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-aws-jenkins-client-plugin-techpreview-rhcos10,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -243,6 +324,168 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-jenkins-sync-plugin,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/e2e-aws-jenkins-sync-plugin-techpreview-rhcos10 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-jenkins-master-e2e-aws-jenkins-sync-plugin-techpreview-rhcos10 + optional: true + rerun_command: /test e2e-aws-jenkins-sync-plugin-techpreview-rhcos10 + 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 + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-jenkins-sync-plugin-techpreview-rhcos10 + 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: /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-aws-jenkins-sync-plugin-techpreview-rhcos10,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/e2e-aws-techpreview-rhcos10 + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-jenkins-master-e2e-aws-techpreview-rhcos10 + optional: true + rerun_command: /test e2e-aws-techpreview-rhcos10 + 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 + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-techpreview-rhcos10 + 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: /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-aws-techpreview-rhcos10,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -305,6 +548,68 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-jenkins-image-tests,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/e2e-jenkins-image-tests-techpreview-rhcos10 + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-jenkins-master-e2e-jenkins-image-tests-techpreview-rhcos10 + rerun_command: /test e2e-jenkins-image-tests-techpreview-rhcos10 + 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 + - --report-credentials-file=/etc/report/credentials + - --target=e2e-jenkins-image-tests-techpreview-rhcos10 + 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: /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( | .* )e2e-jenkins-image-tests-techpreview-rhcos10,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -421,6 +726,68 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )jenkins-check-plugins-supply-chain-change,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/jenkins-check-plugins-supply-chain-change-techpreview-rhcos10 + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-jenkins-master-jenkins-check-plugins-supply-chain-change-techpreview-rhcos10 + rerun_command: /test jenkins-check-plugins-supply-chain-change-techpreview-rhcos10 + 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 + - --report-credentials-file=/etc/report/credentials + - --target=jenkins-check-plugins-supply-chain-change-techpreview-rhcos10 + 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: /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( | .* )jenkins-check-plugins-supply-chain-change-techpreview-rhcos10,?($|\s.*) - agent: kubernetes always_run: true branches: