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

OCPBUGS-20070: fix: e2e: add gcp custom type to test framework #244

Merged

Conversation

damdo
Copy link
Member

@damdo damdo commented Oct 4, 2023

Fixes a test framework failure by adding the GCP instance custom type support to it.

@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 4, 2023
@openshift-ci-robot
Copy link

@damdo: This pull request references Jira Issue OCPBUGS-20070, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Fixes a test framework failure by adding the GCP instance custom type support to it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 4, 2023
@RadekManak
Copy link
Contributor

/test periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.15-periodics-e2e-gcp

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 4, 2023

@RadekManak: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test crds-sync
  • /test e2e-aws-operator
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-etcd-scaling
  • /test e2e-aws-ovn-serial
  • /test e2e-aws-ovn-upgrade
  • /test fmt
  • /test generate
  • /test images
  • /test lint
  • /test unit
  • /test vendor
  • /test vet

The following commands are available to trigger optional jobs:

  • /test e2e-aws-periodic-pre
  • /test e2e-azure-operator
  • /test e2e-azure-ovn-etcd-scaling
  • /test e2e-gcp-operator
  • /test e2e-gcp-ovn-etcd-scaling
  • /test e2e-nutanix-ovn
  • /test e2e-openstack-operator
  • /test e2e-openstack-operator-zone
  • /test e2e-vsphere-multi-zone-operator
  • /test e2e-vsphere-operator
  • /test e2e-vsphere-ovn-etcd-scaling

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-crds-sync
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-operator
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn-etcd-scaling
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn-serial
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-fmt
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-generate
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-images
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-lint
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-unit
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-vendor
  • pull-ci-openshift-cluster-control-plane-machine-set-operator-main-vet

In response to this:

/test periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.15-periodics-e2e-gcp

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@damdo
Copy link
Member Author

damdo commented Oct 4, 2023

@RadekManak the only periodic pre available is for AWS.

@damdo
Copy link
Member Author

damdo commented Oct 4, 2023

But it looks like in the presubmits we do run the increase instance size step.

helpers.IncreaseControlPlaneMachineSetInstanceSize(testFramework)

So let's see if that passes, and if we get those e2-custom machines for that.
Otherwise we might need to try and test it in a different way.

@damdo
Copy link
Member Author

damdo commented Oct 4, 2023

/test e2e-gcp-operator
/test e2e-gcp-ovn-etcd-scaling

@odvarkadaniel
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2023
@damdo
Copy link
Member Author

damdo commented Oct 5, 2023

/assign @JoelSpeed

return "", fmt.Errorf("%w: %s", errInstanceTypeNotSupported, current)
}

return fmt.Sprintf("%s-%s-%d-%d", family, subfamily, multiplier+1, multiplier2+256), nil
Copy link
Contributor

Choose a reason for hiding this comment

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

Where did the +1 and +256 come from?

Copy link
Contributor

Choose a reason for hiding this comment

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

I believe it comes from this doc for custom GCP instances: https://cloud.google.com/compute/docs/instances/creating-instance-with-custom-machine-type

Copy link
Contributor

Choose a reason for hiding this comment

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

Reading that, it suggests that memory is relatively free in what we can spec, so +256 is ok, but it suggests that CPUs can be "1 to 96 or any even value in between".

I don't think we are accounting for the even part of the above statement

Copy link
Contributor

Choose a reason for hiding this comment

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

According to: https://cloud.google.com/compute/docs/general-purpose-machines#custom_machine_types

E2 custom machine types support predefined platforms with Intel or AMD EPYC processors. You can create E2 custom machine types with vCPUs in multiples of 2, up to 32 vCPUs. The minimum acceptable number of vCPUs for a VM is 2.

There is also a constraint for memory - cpu cores ratio (shown in this example of invalid instance):

32 vCPUs, 1 GB of total memory. Invalid because the ratio of vCPUs to memory is incorrect. The acceptable ratio is 0.5 GB of memory to 1 vCPU.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ahh good catch @JoelSpeed. I looked at the limitations section but couldn't find anything regarding CPU.
Thanks for flagging, will update this.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've updated it by taking into account all the limitations described in the doc that @odvarkadaniel shared.

@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 6, 2023
@damdo
Copy link
Member Author

damdo commented Oct 6, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 6, 2023
@openshift-ci-robot
Copy link

@damdo: This pull request references Jira Issue OCPBUGS-20070, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot
Copy link

@damdo: This pull request references Jira Issue OCPBUGS-20070, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

Fixes a test framework failure by adding the GCP instance custom type support to it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 6, 2023

@damdo: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@damdo
Copy link
Member Author

damdo commented Oct 9, 2023

Can you take a look again when you got some time @JoelSpeed ? Tx

@JoelSpeed
Copy link
Contributor

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 9, 2023
@openshift-ci-robot
Copy link

@damdo: This pull request references Jira Issue OCPBUGS-20070, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @miyadav

In response to this:

Fixes a test framework failure by adding the GCP instance custom type support to it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested a review from miyadav October 9, 2023 14:19
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 9, 2023
@openshift-ci openshift-ci bot merged commit e57f7ea into openshift:main Oct 9, 2023
14 checks passed
@openshift-ci-robot
Copy link

@damdo: Jira Issue OCPBUGS-20070: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-20070 has been moved to the MODIFIED state.

In response to this:

Fixes a test framework failure by adding the GCP instance custom type support to it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@damdo
Copy link
Member Author

damdo commented Oct 10, 2023

/payload-job periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.15-periodics-e2e-gcp

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 10, 2023

@damdo: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.15-periodics-e2e-gcp

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/79ca7ea0-6781-11ee-8888-5dc01135b3cb-0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants