diff --git a/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml b/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml new file mode 100644 index 0000000000000..b54883dc8b458 --- /dev/null +++ b/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml @@ -0,0 +1,51 @@ +base_images: + ocp_builder_stream9: + name: builder + namespace: ocp + tag: stream9 +images: +- build_args: + - name: OPENSHIFT_CI + value: "1" + dockerfile_path: Containerfile + to: stream-coreos +- build_args: + - name: VARIANT + value: okd-c9s + dockerfile_path: extensions/Dockerfile + inputs: + ocp_builder_stream9: + as: + - registry.access.redhat.com/ubi9/ubi:latest + stream-coreos: + as: + - registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest + to: stream-coreos-extensions +promotion: + to: + - name: scos-4.19 + namespace: origin +releases: + latest: + integration: + include_built_images: true + name: scos-4.19 + namespace: origin +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- always_run: false + as: e2e-aws-ovn + optional: true + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + steps: + cluster_profile: aws + workflow: openshift-e2e-aws +zz_generated_metadata: + branch: master + org: openshift + repo: os + variant: okd-scos diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml index 9137ad034b434..9b26f2801e24f 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml @@ -60,3 +60,65 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^master$ + cluster: build11 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/variant: okd-scos + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-os-master-okd-scos-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=okd-scos + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + 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/push-secret + name: push-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: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml index 875ee1bc12c26..77e77041f257e 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml @@ -133,6 +133,142 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-scos-e2e-aws-ovn + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: okd-scos + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-master-okd-scos-e2e-aws-ovn + optional: true + rerun_command: /test okd-scos-e2e-aws-ovn + 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 + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-ovn + - --variant=okd-scos + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + 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( | .* )okd-scos-e2e-aws-ovn,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/okd-scos-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/variant: okd-scos + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-master-okd-scos-images + rerun_command: /test okd-scos-images + 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=[images] + - --target=[release:latest] + - --variant=okd-scos + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + 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( | .* )okd-scos-images,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/core-services/image-mirroring/openshift/mapping_origin_scos-4_19 b/core-services/image-mirroring/openshift/mapping_origin_scos-4_19 index 5ac4885836470..7e4165eb4baaf 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_scos-4_19 +++ b/core-services/image-mirroring/openshift/mapping_origin_scos-4_19 @@ -183,6 +183,8 @@ registry.ci.openshift.org/origin/scos-4.19:prometheus-operator quay.io/openshift registry.ci.openshift.org/origin/scos-4.19:prometheus-operator-admission-webhook quay.io/openshift/origin-prometheus-operator-admission-webhook:4.19 quay.io/openshift/origin-prometheus-operator-admission-webhook:4.19.0 quay.io/openshift/origin-prometheus-operator-admission-webhook:latest registry.ci.openshift.org/origin/scos-4.19:route-controller-manager quay.io/openshift/origin-route-controller-manager:4.19 quay.io/openshift/origin-route-controller-manager:4.19.0 quay.io/openshift/origin-route-controller-manager:latest registry.ci.openshift.org/origin/scos-4.19:service-ca-operator quay.io/openshift/origin-service-ca-operator:4.19 quay.io/openshift/origin-service-ca-operator:4.19.0 quay.io/openshift/origin-service-ca-operator:latest +registry.ci.openshift.org/origin/scos-4.19:stream-coreos quay.io/openshift/origin-stream-coreos:4.19 quay.io/openshift/origin-stream-coreos:4.19.0 quay.io/openshift/origin-stream-coreos:latest +registry.ci.openshift.org/origin/scos-4.19:stream-coreos-extensions quay.io/openshift/origin-stream-coreos-extensions:4.19 quay.io/openshift/origin-stream-coreos-extensions:4.19.0 quay.io/openshift/origin-stream-coreos-extensions:latest registry.ci.openshift.org/origin/scos-4.19:telemeter quay.io/openshift/origin-telemeter:4.19 quay.io/openshift/origin-telemeter:4.19.0 quay.io/openshift/origin-telemeter:latest registry.ci.openshift.org/origin/scos-4.19:tests quay.io/openshift/origin-tests:4.19 quay.io/openshift/origin-tests:4.19.0 quay.io/openshift/origin-tests:latest registry.ci.openshift.org/origin/scos-4.19:thanos quay.io/openshift/origin-thanos:4.19 quay.io/openshift/origin-thanos:4.19.0 quay.io/openshift/origin-thanos:latest