diff --git a/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml new file mode 100644 index 0000000000000..efeede7e93ac2 --- /dev/null +++ b/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml @@ -0,0 +1,260 @@ +base_images: + assisted-test-infra: + name: assisted-test + namespace: ocp-kni + tag: assisted-test-infra + base: + name: "4.9" + namespace: origin + tag: base + dev-scripts: + name: test + namespace: ocp-kni + tag: dev-scripts + ocp_4.1_cli: + name: "4.1" + namespace: origin + tag: cli + ocp_4.6_cli: + name: "4.9" + namespace: origin + tag: cli + ocp_4.8_cli: + name: "4.9" + namespace: origin + tag: cli + ocp_builder_golang-1.13: + name: builder + namespace: ocp + tag: golang-1.13 + ocp_builder_golang-1.14: + name: builder + namespace: ocp + tag: golang-1.14 + ocp_builder_rhel-8-golang-1.15-openshift-4.6: + name: builder + namespace: ocp + tag: rhel-8-golang-1.15-openshift-4.6 + ocp_builder_rhel-8-golang-1.15-openshift-4.7: + name: builder + namespace: ocp + tag: rhel-8-golang-1.15-openshift-4.7 + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + name: builder + namespace: ocp + tag: rhel-8-golang-1.15-openshift-4.8 + ocp_builder_rhel-8-golang-1.16-openshift-4.8: + name: builder + namespace: ocp + tag: rhel-8-golang-1.16-openshift-4.8 + ocp_builder_rhel-8-golang-1.16-openshift-4.9: + name: builder + namespace: ocp + tag: rhel-8-golang-1.16-openshift-4.9 + ocp_builder_rhel-8-golang-openshift-4.6: + name: builder + namespace: ocp + tag: rhel-8-golang-openshift-4.6 + openshift_release_golang-1.13: + name: release + namespace: openshift + tag: golang-1.13 + openshift_release_golang-1.14: + name: release + namespace: openshift + tag: golang-1.14 + origin_4.2_cli: + name: "4.2" + namespace: origin + tag: cli + origin_4.6_cli: + name: "4.6" + namespace: origin + tag: cli + origin_4.7_cli: + name: "4.7" + namespace: origin + tag: cli + origin_4.8_cli: + name: "4.9" + namespace: origin + tag: cli + rhel-7: + name: "4.9" + namespace: ocp + tag: base-7 +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.14 +images: +- build_args: + - name: TAGS + value: okd + dockerfile_path: images/installer/Dockerfile.ci + from: base + inputs: + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + ocp_builder_rhel-8-golang-1.16-openshift-4.9: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 + to: installer +- build_args: + - name: TAGS + value: okd + dockerfile_path: images/installer-artifacts/Dockerfile.rhel + from: installer + inputs: + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + ocp_builder_rhel-8-golang-1.16-openshift-4.9: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 + to: installer-artifacts +- build_args: + - name: TAGS + value: libvirt okd + dockerfile_path: images/libvirt/Dockerfile.ci + from: base + inputs: + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + to: libvirt-installer +- build_args: + - name: TAGS + value: okd + dockerfile_path: images/installer/Dockerfile.upi.ci + from: rhel-7 + inputs: + ocp_4.8_cli: + as: + - registry.ci.openshift.org/ocp/4.8:cli + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + to: upi-installer +- build_args: + - name: TAGS + value: okd + dockerfile_path: images/openstack/Dockerfile.ci + from: base + inputs: + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + origin_4.8_cli: + as: + - registry.ci.openshift.org/origin/4.8:cli + to: openstack-installer +- build_args: + - name: TAGS + value: baremetal libvirt okd + dockerfile_path: images/baremetal/Dockerfile.ci + from: base + inputs: + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + ocp_builder_rhel-8-golang-1.16-openshift-4.9: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 + to: baremetal-installer +- build_args: + - name: TAGS + value: okd + dockerfile_path: images/installer/Dockerfile.ci + from: base + inputs: + ocp_builder_rhel-8-golang-1.15-openshift-4.8: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 + ocp_builder_rhel-8-golang-1.16-openshift-4.9: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 + to: ovirt-installer +promotion: + name: "4.9" + namespace: origin +resources: + '*': + requests: + cpu: 100m + memory: 200Mi + baremetal-installer: + requests: + cpu: "3" + memory: 5Gi + govet: + requests: + cpu: "3" + memory: 5Gi + installer: + requests: + cpu: "3" + memory: 5Gi + installer-artifacts: + requests: + cpu: "3" + memory: 5Gi + libvirt-installer: + requests: + cpu: "3" + memory: 5Gi + openstack-installer: + requests: + cpu: "3" + memory: 5Gi + ovirt-installer: + requests: + cpu: "3" + memory: 5Gi + unit: + requests: + cpu: "3" + memory: 5Gi + upi-installer: + requests: + cpu: "3" + memory: 5Gi +tag_specification: + name: "4.9" + namespace: origin +tests: +- as: unit + commands: go test ./pkg/... + container: + from: src +- as: verify-codegen + commands: IS_CONTAINER=TRUE ./hack/verify-codegen.sh + container: + from: src +- as: e2e-aws + steps: + cluster_profile: aws + workflow: openshift-e2e-aws +- as: e2e-gcp + steps: + cluster_profile: gcp + workflow: openshift-e2e-gcp +- as: e2e-aws-upgrade + steps: + cluster_profile: aws + workflow: openshift-upgrade-aws +- as: e2e-gcp-upgrade + steps: + cluster_profile: gcp + workflow: openshift-upgrade-gcp +- as: e2e-vsphere + steps: + cluster_profile: vsphere + workflow: openshift-e2e-vsphere +zz_generated_metadata: + branch: master + org: openshift + repo: installer + variant: okd diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-postsubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-postsubmits.yaml index b709e3f96f48d..31c6548f69175 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-postsubmits.yaml @@ -51,3 +51,58 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + branches: + - ^master$ + cluster: build02 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + max_concurrency: 1 + name: branch-ci-openshift-installer-master-okd-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 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + 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: 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/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index eb8f8fb88e33a..5f4f3e17c6934 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -2761,6 +2761,513 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-e2e-aws + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-e2e-aws + optional: true + rerun_command: /test okd-e2e-aws + 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=/usr/local/e2e-aws-cluster-profile + - --target=e2e-aws + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-aws-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-e2e-aws-upgrade + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-e2e-aws-upgrade + optional: true + rerun_command: /test okd-e2e-aws-upgrade + 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=/usr/local/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-aws-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-e2e-gcp + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-e2e-gcp + optional: true + rerun_command: /test okd-e2e-gcp + 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=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-gcp-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-gcp,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-e2e-gcp-upgrade + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-e2e-gcp-upgrade + optional: true + rerun_command: /test okd-e2e-gcp-upgrade + 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=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-gcp-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: vsphere + context: ci/prow/okd-e2e-vsphere + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-e2e-vsphere + optional: true + rerun_command: /test okd-e2e-vsphere + 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=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-vsphere-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + 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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-vsphere + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-e2e-vsphere,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-images + rerun_command: /test okd-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] + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-unit + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-unit + rerun_command: /test okd-unit + 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=unit + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-unit,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/okd-verify-codegen + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: okd + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-okd-verify-codegen + rerun_command: /test okd-verify-codegen + 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=verify-codegen + - --variant=okd + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-verify-codegen,?($|\s.*) - agent: kubernetes always_run: false branches: