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.

Sign up for GitHub

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

Creating MCO Job for OCL E2E Testing with OpenShift Upgrade #58241

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Creating MCO Job for OCL E2E Testing with OpenShift Upgrade #58241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 100 additions & 0 deletions ...or/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,14 @@ images:
ostree container commit
from: ocp_os
to: custom-os-image
- dockerfile_literal: |
FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
Copy link
Member

Choose a reason for hiding this comment

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

thought (non-blocking): Once openshift/machine-config-operator#4718 lands, we'll need to tweak this job slightly to build the tools from the MCO repository instead of pulling them from this container image.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

makes sense

to: zacks-toolbox
promotion:
to:
- excluded_images:
- custom-os-image
- zacks-toolbox
name: "4.19"
namespace: ocp
releases:
Expand Down Expand Up @@ -467,6 +471,102 @@ tests:
env:
PROJECT_NAME: machine-config-operator
workflow: openshift-ci-security
- always_run: false
as: e2e-aws-ovn-upgrade-ocb-techpreview
optional: true
steps:
cluster_profile: aws
env:
FEATURE_SET: TechPreviewNoUpgrade
test:
- as: get-prelayering-rpmostree-status
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
from: zacks-toolbox
resources:
requests:
cpu: 100m
- as: enable-layering
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
onclustertesting version
onclustertesting setup ci --inject-yum-repos --containerfile-path <(curl -L https://raw.githubusercontent.com/openshift/machine-config-operator/refs/heads/master/test/e2e-ocl/Containerfile.cowsay)
from: zacks-toolbox
resources:
requests:
cpu: 100m
- as: get-postlayering-rpmostree-status
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
from: zacks-toolbox
resources:
requests:
cpu: 100m
- ref: openshift-e2e-test
- as: get-posttest-rpmostree-status
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
from: zacks-toolbox
resources:
requests:
cpu: 100m
workflow: openshift-upgrade-aws
RishabhSaini marked this conversation as resolved.
Show resolved Hide resolved
timeout: 5h0m0s
- always_run: false
as: e2e-aws-ovn-ocb-techpreview
optional: true
steps:
cluster_profile: aws
env:
FEATURE_SET: TechPreviewNoUpgrade
test:
- as: get-prelayering-rpmostree-status
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
from: zacks-toolbox
resources:
requests:
cpu: 100m
- as: enable-layering
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
onclustertesting version
onclustertesting setup ci --inject-yum-repos --containerfile-path <(curl -L https://raw.githubusercontent.com/openshift/machine-config-operator/refs/heads/master/test/e2e-ocl/Containerfile.cowsay)
from: zacks-toolbox
resources:
requests:
cpu: 100m
- as: get-postlayering-rpmostree-status
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
from: zacks-toolbox
resources:
requests:
cpu: 100m
- ref: openshift-e2e-test
- as: get-posttest-rpmostree-status
commands: |-
#!/usr/bin/env bash
set -xeuo pipefail
run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
from: zacks-toolbox
resources:
requests:
cpu: 100m
workflow: openshift-e2e-aws
timeout: 5h0m0s
zz_generated_metadata:
branch: master
org: openshift
Expand Down
150 changes: 150 additions & 0 deletions ...penshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,81 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-ovn-fips-op,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build05
context: ci/prow/e2e-aws-ovn-ocb-techpreview
decorate: true
decoration_config:
timeout: 5h0m0s
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-master-e2e-aws-ovn-ocb-techpreview
optional: true
rerun_command: /test e2e-aws-ovn-ocb-techpreview
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-ocb-techpreview
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( | .* )e2e-aws-ovn-ocb-techpreview,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down Expand Up @@ -699,6 +774,81 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build05
context: ci/prow/e2e-aws-ovn-upgrade-ocb-techpreview
decorate: true
decoration_config:
timeout: 5h0m0s
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-master-e2e-aws-ovn-upgrade-ocb-techpreview
optional: true
rerun_command: /test e2e-aws-ovn-upgrade-ocb-techpreview
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-upgrade-ocb-techpreview
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( | .* )e2e-aws-ovn-upgrade-ocb-techpreview,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down