Skip to content
Merged
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 @@ -166,32 +166,30 @@ tests:
resources:
requests:
cpu: 100m
- as: tests-extension-verify
- as: tests-extension
run_if_changed: ^(openshift/tests-extension/)
steps:
test:
- as: tests-extension-verify
- as: sanity
commands: |
cd openshift/tests-extension
make verify
make build
make verify-metadata
from: src
resources:
requests:
cpu: 100m
- as: tests-extension
- as: e2e-aws-techpreview-olmv1-ext
steps:
cluster_profile: aws
env:
FEATURE_SET: TechPreviewNoUpgrade
TEST_ARGS: --monitor=watch-namespaces
TEST_SUITE: olmv1/all
test:
- as: tests-extension
commands: |
echo "Build binary olmv1-tests-ext"
cd openshift/tests-extension
make build
echo "Running olmv1-tests-ext with all tests"
./bin/olmv1-tests-ext run-suite olmv1/all
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need to replace it for the test done bellow with the ENV so that it will be executed as openshift/origin does

from: src
resources:
requests:
cpu: 100m
- ref: openshift-e2e-test
workflow: openshift-e2e-aws
zz_generated_metadata:
branch: main
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,32 +167,30 @@ tests:
resources:
requests:
cpu: 100m
- as: tests-extension-verify
- as: tests-extension
run_if_changed: ^(openshift/tests-extension/)
steps:
test:
- as: tests-extension-verify
- as: sanity
commands: |
cd openshift/tests-extension
make verify
make build
make verify-metadata
from: src
resources:
requests:
cpu: 100m
- as: tests-extension
- as: e2e-aws-techpreview-olmv1-ext
steps:
cluster_profile: aws
env:
FEATURE_SET: TechPreviewNoUpgrade
TEST_ARGS: --monitor=watch-namespaces
TEST_SUITE: olmv1/all
test:
- as: tests-extension
commands: |
echo "Build binary olmv1-tests-ext"
cd openshift/tests-extension
make build
echo "Running olmv1-tests-ext with all tests"
./bin/olmv1-tests-ext run-suite olmv1/all
from: src
resources:
requests:
cpu: 100m
- ref: openshift-e2e-test
workflow: openshift-e2e-aws
zz_generated_metadata:
branch: release-4.20
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,32 +166,30 @@ tests:
resources:
requests:
cpu: 100m
- as: tests-extension-verify
- as: tests-extension
run_if_changed: ^(openshift/tests-extension/)
steps:
test:
- as: tests-extension-verify
- as: sanity
commands: |
cd openshift/tests-extension
make verify
make build
make verify-metadata
from: src
resources:
requests:
cpu: 100m
- as: tests-extension
- as: e2e-aws-techpreview-olmv1-ext
steps:
cluster_profile: aws
env:
FEATURE_SET: TechPreviewNoUpgrade
TEST_ARGS: --monitor=watch-namespaces
TEST_SUITE: olmv1/all
test:
- as: tests-extension
commands: |
echo "Build binary olmv1-tests-ext"
cd openshift/tests-extension
make build
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we replacing as suggested

echo "Running olmv1-tests-ext with all tests"
./bin/olmv1-tests-ext run-suite olmv1/all
from: src
resources:
requests:
cpu: 100m
- ref: openshift-e2e-test
workflow: openshift-e2e-aws
zz_generated_metadata:
branch: release-4.21
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,78 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )default-catalog-consistency,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build09
context: ci/prow/e2e-aws-techpreview-olmv1-ext
decorate: 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-operator-framework-operator-controller-main-e2e-aws-techpreview-olmv1-ext
rerun_command: /test e2e-aws-techpreview-olmv1-ext
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-techpreview-olmv1-ext
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-techpreview-olmv1-ext,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down Expand Up @@ -452,7 +524,7 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*)
- agent: kubernetes
always_run: true
always_run: false
branches:
- ^main$
- ^main-
Expand All @@ -464,6 +536,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-operator-framework-operator-controller-main-tests-extension
rerun_command: /test tests-extension
run_if_changed: ^(openshift/tests-extension/)
spec:
containers:
- args:
Expand Down Expand Up @@ -511,67 +584,6 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )tests-extension,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build07
context: ci/prow/tests-extension-verify
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-operator-framework-operator-controller-main-tests-extension-verify
rerun_command: /test tests-extension-verify
run_if_changed: ^(openshift/tests-extension/)
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
- --secret-dir=/secrets/ci-pull-credentials
- --target=tests-extension-verify
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- 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: 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( | .* )tests-extension-verify,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
Loading