Skip to content

Enable byoh scaleup tests for MCO: always_run and optional. #3748

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

Closed
patrickdillon wants to merge 1 commit into from
Closed

Enable byoh scaleup tests for MCO: always_run and optional. #3748

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
2 changes: 1 addition & 1 deletion ...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 @@ -65,7 +65,7 @@ tests:
openshift_installer:
cluster_profile: aws
upgrade: true
- as: e2e-rhel-scaleup
- as: e2e-aws-scaleup-rhel7
commands: TEST_SUITE=openshift/conformance run-tests
openshift_ansible_40:
cluster_profile: aws-centos-40
Expand Down
2 changes: 1 addition & 1 deletion ...nfig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ tests:
openshift_installer:
cluster_profile: aws
upgrade: true
- as: e2e-rhel-scaleup
- as: e2e-aws-scaleup-rhel7
commands: TEST_SUITE=openshift/conformance run-tests
openshift_ansible_40:
cluster_profile: aws-centos-40
Expand Down
2 changes: 1 addition & 1 deletion ...nfig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ tests:
openshift_installer:
cluster_profile: aws
upgrade: true
- as: e2e-rhel-scaleup
- as: e2e-aws-scaleup-rhel7
commands: TEST_SUITE=openshift/conformance run-tests
openshift_ansible_40:
cluster_profile: aws-centos-40
Expand Down
2 changes: 1 addition & 1 deletion ...nfig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ tests:
openshift_installer:
cluster_profile: aws
upgrade: true
- as: e2e-rhel-scaleup
- as: e2e-aws-scaleup-rhel7
commands: TEST_SUITE=openshift/conformance run-tests
openshift_ansible_40:
cluster_profile: aws-centos-40
Expand Down
96 changes: 48 additions & 48 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 @@ -134,39 +134,52 @@ presubmits:
always_run: true
branches:
- master
context: ci/prow/e2e-aws-upgrade
context: ci/prow/e2e-aws-scaleup-rhel7
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice May 10, 2019

Choose a reason for hiding this comment

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

just to clarify, you made some tweaks to rhel scaleup here and also reordered the upgrade & scaleup in this file?

Copy link
Contributor Author

@patrickdillon patrickdillon May 10, 2019

Choose a reason for hiding this comment

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

@kikisdeliveryservice these files are generated by prowgen. I'm guessing it tries to keep them in alphabetical order, which unfortunately is making this harder to review. As best as I can tell there were no unintended changes to the upgrade job.

Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice May 10, 2019

Choose a reason for hiding this comment

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

ahhh thank you!! did not realize!

decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: pull-ci-openshift-machine-config-operator-master-e2e-aws-upgrade
rerun_command: /test e2e-aws-upgrade
name: pull-ci-openshift-machine-config-operator-master-e2e-aws-scaleup-rhel7
optional: true
rerun_command: /test e2e-aws-scaleup-rhel7
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
- --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=e2e-aws-upgrade
- --target=e2e-aws-scaleup-rhel7
- --template=/usr/local/e2e-aws-scaleup-rhel7
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-master.yaml
name: ci-operator-master-configs
- name: JOB_NAME_SAFE
value: e2e-aws-scaleup-rhel7
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
- mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-aws-scaleup-rhel7
name: job-definition
subPath: cluster-scaleup-e2e-40.yaml
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
Expand All @@ -177,60 +190,52 @@ presubmits:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: cluster-profile-aws-centos-40
- configMap:
name: prow-job-cluster-scaleup-e2e-40
name: job-definition
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$'
- agent: kubernetes
always_run: false
always_run: true
branches:
- master
context: ci/prow/e2e-restore-cluster-state
context: ci/prow/e2e-aws-upgrade
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: pull-ci-openshift-machine-config-operator-master-e2e-restore-cluster-state
optional: true
rerun_command: /test e2e-restore-cluster-state
name: pull-ci-openshift-machine-config-operator-master-e2e-aws-upgrade
rerun_command: /test e2e-aws-upgrade
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
- --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=e2e-restore-cluster-state
- --template=/usr/local/e2e-restore-cluster-state
- --target=e2e-aws-upgrade
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-master.yaml
name: ci-operator-master-configs
- name: JOB_NAME_SAFE
value: e2e-restore-cluster-state
- name: TEST_COMMAND
value: |
restore-cluster-state
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-restore-cluster-state
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
Expand All @@ -241,35 +246,32 @@ presubmits:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/e2e-rhel-scaleup
context: ci/prow/e2e-restore-cluster-state
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: pull-ci-openshift-machine-config-operator-master-e2e-rhel-scaleup
name: pull-ci-openshift-machine-config-operator-master-e2e-restore-cluster-state
optional: true
rerun_command: /test e2e-rhel-scaleup
rerun_command: /test e2e-restore-cluster-state
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile
- --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=e2e-rhel-scaleup
- --template=/usr/local/e2e-rhel-scaleup
- --target=e2e-restore-cluster-state
- --template=/usr/local/e2e-restore-cluster-state
command:
- ci-operator
env:
Expand All @@ -281,23 +283,23 @@ presubmits:
key: openshift-machine-config-operator-master.yaml
name: ci-operator-master-configs
- name: JOB_NAME_SAFE
value: e2e-rhel-scaleup
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/
value: e2e-restore-cluster-state
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance run-tests
value: |
restore-cluster-state
TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile
- mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-rhel-scaleup
- mountPath: /usr/local/e2e-restore-cluster-state
name: job-definition
subPath: cluster-scaleup-e2e-40.yaml
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
Expand All @@ -308,15 +310,13 @@ presubmits:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: cluster-profile-aws-centos-40
- configMap:
name: prow-job-cluster-scaleup-e2e-40
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$'
trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$'
- agent: kubernetes
always_run: true
branches:
Expand Down
Loading