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

Jump to bottom

Add OLM upgrade test to file-integrity-operator #30613

Merged
merged 1 commit into from
Aug 1, 2022
Merged

Add OLM upgrade test to file-integrity-operator #30613

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 63 additions & 0 deletions ...or/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ base_images:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.17-openshift-4.10
operator-index:
name: redhat-operator-index
namespace: ci
tag: v4.10
build_root:
image_stream_tag:
name: release
Expand All @@ -15,6 +19,18 @@ images:
as:
- registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.17-openshift-4.10
to: file-integrity-operator
operator:
bundles:
- as: file-integrity-operator-bundle
base_index: operator-index
context_dir: .
dockerfile_path: bundle.Dockerfile
update_graph: replaces
substitutions:
- pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
with: pipeline:file-integrity-operator
- pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
with: pipeline:file-integrity-operator
promotion:
name: "4.12"
namespace: ocp
Expand Down Expand Up @@ -61,6 +77,53 @@ tests:
requests:
cpu: 100m
workflow: ipi-aws
- as: e2e-bundle-aws
steps:
cluster_profile: aws
dependencies:
OO_INDEX: ci-index-file-integrity-operator-bundle
env:
OO_CHANNEL: alpha
OO_INSTALL_NAMESPACE: file-integrity
OO_PACKAGE: file-integrity-operator
OO_TARGET_NAMESPACES: '!install'
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm wondering if we can specify the version without hard-coding it. The docs I've read use version strings.

test:
- as: test-bundle
cli: latest
commands: TEST_BUNDLE_INSTALL=1 TEST_WATCH_NAMESPACE=file-integrity TEST_OPERATOR_NAMESPACE=file-integrity
make e2e
dependencies:
- env: IMAGE_FROM_CI
name: file-integrity-operator
from: src
resources:
requests:
cpu: 100m
workflow: optional-operators-ci-aws
- as: e2e-bundle-aws-upgrade
steps:
cluster_profile: aws
dependencies:
OO_INDEX: ci-index-file-integrity-operator-bundle
env:
OO_CHANNEL: alpha
OO_INSTALL_NAMESPACE: file-integrity
OO_LATEST_CSV: file-integrity-operator.v0.1.30
OO_PACKAGE: file-integrity-operator
OO_TARGET_NAMESPACES: '!install'
test:
- as: test-bundle-upgrade
cli: latest
commands: TEST_BUNDLE_INSTALL=1 TEST_WATCH_NAMESPACE=file-integrity TEST_OPERATOR_NAMESPACE=file-integrity
make e2e
dependencies:
- env: IMAGE_FROM_CI
name: file-integrity-operator
from: src
resources:
requests:
cpu: 100m
workflow: optional-operators-ci-aws-upgrade
zz_generated_metadata:
branch: master
org: openshift
Expand Down
197 changes: 197 additions & 0 deletions ...penshift/file-integrity-operator/openshift-file-integrity-operator-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,54 @@
presubmits:
openshift/file-integrity-operator:
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build03
context: ci/prow/ci-index-file-integrity-operator-bundle
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-file-integrity-operator-master-ci-index-file-integrity-operator-bundle
rerun_command: /test ci-index-file-integrity-operator-bundle
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=ci-index-file-integrity-operator-bundle
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( | .* )ci-index-file-integrity-operator-bundle,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down Expand Up @@ -74,6 +123,154 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build03
context: ci/prow/e2e-bundle-aws
decorate: true
decoration_config:
skip_cloning: true
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-file-integrity-operator-master-e2e-bundle-aws
rerun_command: /test e2e-bundle-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=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/e2e-bundle-aws-cluster-profile
- --target=e2e-bundle-aws
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: /usr/local/e2e-bundle-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: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-bundle-aws,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build03
context: ci/prow/e2e-bundle-aws-upgrade
decorate: true
decoration_config:
skip_cloning: true
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-file-integrity-operator-master-e2e-bundle-aws-upgrade
rerun_command: /test e2e-bundle-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=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/e2e-bundle-aws-upgrade-cluster-profile
- --target=e2e-bundle-aws-upgrade
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: /usr/local/e2e-bundle-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: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-bundle-aws-upgrade,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down