Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP OKD: add optional platform tests to fcos branch of the installer #6976

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ images:
as:
- registry.svc.ci.openshift.org/openshift/release:golang-1.14
to: baremetal-installer
- dockerfile_path: images/installer/Dockerfile.ci
from: base
inputs:
openshift_release_golang-1.14:
as:
- registry.svc.ci.openshift.org/openshift/release:golang-1.14
to: ovirt-installer
promotion:
name: "4.6"
namespace: origin
Expand Down Expand Up @@ -121,6 +128,10 @@ resources:
requests:
cpu: "3"
memory: 5Gi
ovirt-installer:
requests:
cpu: "3"
memory: 5Gi
unit:
requests:
cpu: "3"
Expand Down Expand Up @@ -161,14 +172,18 @@ tests:
steps:
cluster_profile: aws
workflow: openshift-e2e-aws
- as: e2e-vsphere-upi
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer_upi:
cluster_profile: vsphere
- as: e2e-vsphere
steps:
cluster_profile: vsphere
workflow: openshift-e2e-vsphere
- as: e2e-vsphere-upi
steps:
cluster_profile: vsphere
workflow: openshift-e2e-vsphere-upi
- as: e2e-azure
steps:
cluster_profile: azure4
workflow: openshift-e2e-azure
zz_generated_metadata:
branch: fcos
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,70 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- fcos
cluster: api.ci
context: ci/prow/e2e-azure
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-fcos-e2e-azure
optional: true
rerun_command: /test e2e-azure
spec:
containers:
- args:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-password-file=/etc/boskos/password
- --report-password-file=/etc/report/password.txt
- --report-username=ci
- --secret-dir=/usr/local/e2e-azure-cluster-profile
- --target=e2e-azure
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-azure-cluster-profile
name: cluster-profile
- 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: password
path: password
secretName: boskos-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-azure4
- name: pull-secret
secret:
secretName: regcred
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down Expand Up @@ -143,6 +207,7 @@ presubmits:
name: pull-ci-openshift-installer-fcos-e2e-openstack
optional: true
rerun_command: /test e2e-openstack
run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
spec:
containers:
- args:
Expand Down Expand Up @@ -215,6 +280,90 @@ presubmits:
secret:
secretName: regcred
trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- fcos
cluster: api.ci
context: ci/prow/e2e-ovirt
decorate: true
decoration_config:
skip_cloning: true
labels:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-fcos-e2e-ovirt
optional: true
rerun_command: /test e2e-ovirt
run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing:

  • --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
  • --kubeconfig=/etc/apici/kubeconfig
  • --repo=installer

- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --kubeconfig=/etc/apici/kubeconfig
- --repo=installer
- --secret-dir=/usr/local/e2e-ovirt-cluster-profile
- --target=e2e-ovirt
- --template=/usr/local/e2e-ovirt
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: ovirt
- name: CONFIG_SPEC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why do we need it

valueFrom:
configMapKeyRef:
key: openshift-installer-fcos.yaml
name: ci-operator-misc-configs
- name: JOB_NAME_SAFE
value: e2e-ovirt
- name: LEASE_TYPE
value: minimal
- name: TEST_COMMAND
value: run-minimal-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/apici
name: apici-ci-operator-credentials
readOnly: true
- mountPath: /usr/local/e2e-ovirt-cluster-profile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing:

  • mountPath: /etc/apici
    name: apici-ci-operator-credentials
    readOnly: true
  • mountPath: /etc/pull-secret
    name: pull-secret
    readOnly: true

name: cluster-profile
- mountPath: /usr/local/e2e-ovirt
name: job-definition
subPath: cluster-launch-installer-ovirt-e2e.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: apici-ci-operator-credentials
secret:
items:
- key: sa.ci-operator.apici.config
path: kubeconfig
secretName: apici-ci-operator-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-ovirt
- secret:
name: ovirt-infra-secrets
- configMap:
name: cluster-profile-ovirt
- configMap:
name: prow-job-cluster-launch-installer-ovirt-e2e
name: job-definition
- name: pull-secret
secret:
secretName: regcred
trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down Expand Up @@ -303,16 +452,8 @@ presubmits:
- --report-username=ci
- --secret-dir=/usr/local/e2e-vsphere-upi-cluster-profile
- --target=e2e-vsphere-upi
- --template=/usr/local/e2e-vsphere-upi
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: vsphere
- name: JOB_NAME_SAFE
value: e2e-vsphere-upi
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
Expand All @@ -325,9 +466,6 @@ presubmits:
readOnly: true
- mountPath: /usr/local/e2e-vsphere-upi-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-vsphere-upi
name: job-definition
subPath: cluster-launch-installer-upi-e2e.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
Expand All @@ -347,9 +485,6 @@ presubmits:
sources:
- secret:
name: cluster-secrets-vsphere
- configMap:
name: prow-job-cluster-launch-installer-upi-e2e
name: job-definition
- name: pull-secret
secret:
secretName: regcred
Expand Down