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

Fix e2e calico configuration and BMO installation workflow #277

Merged
merged 2 commits into from
Sep 2, 2021
Merged

Fix e2e calico configuration and BMO installation workflow #277

merged 2 commits into from
Sep 2, 2021

Conversation

namnx228
Copy link
Member

@namnx228 namnx228 commented Aug 27, 2021 •
edited
Loading

This PR Does the following things:

  • Fix the issue calico issue in the target cluster of e2e tests. It downloads the calico manifests, then update the yaml file.
  • Print out the log of some shell commands running in e2e tests.
  • In pivoting test, run clusterctl init before installing BMO because now this installation requires to have cert-manager.

@metal3-io-bot metal3-io-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 27, 2021
@namnx228
Copy link
Member Author

/test-v1a5-e2e
/test-v1a5-centos-e2e

@namnx228
Copy link
Member Author

/test-v1a5-centos-e2e

1 similar comment
@namnx228
Copy link
Member Author

/test-v1a5-centos-e2e

@namnx228
Copy link
Member Author

/test-v1a5-e2e
/test-v1a5-centos-e2e

@namnx228
Copy link
Member Author

/test-v1a5-e2e
/test-v1a5-centos-e2e

@namnx228 namnx228 changed the title Fix e2e no networking nam Fix some e2e test problems Aug 27, 2021
@namnx228
Copy link
Member Author

/test-integration

1 similar comment
@namnx228
Copy link
Member Author

/test-integration

@namnx228
Copy link
Member Author

/assign @furkatgofurov7
/cc @fmuyassarov

fmuyassarov
fmuyassarov reviewed Aug 31, 2021
View reviewed changes
Copy link
Member

@fmuyassarov fmuyassarov left a comment

Choose a reason for hiding this comment

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

LGTM

test/e2e/yaml.go Outdated Show resolved Hide resolved
test/e2e/yaml.go Outdated Show resolved Hide resolved
furkatgofurov7
furkatgofurov7 reviewed Aug 31, 2021
View reviewed changes
Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

Thanks for PR @namnx228. Few comments from my side:

test/e2e/e2e_test.go
cniYaml, err := os.ReadFile(calicoYaml)
Expect(err).To(BeNil(), "Unable to read Calico manifest")
podCIDR := os.Getenv("POD_CIDR")
cniYaml = []byte(strings.Replace(string(cniYaml), "192.168.0.0/16", podCIDR, -1))
Copy link
Member

Choose a reason for hiding this comment

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

I am not getting, what are we after here?

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 am trying to archive the same thing as: https://github.com/metal3-io/metal3-dev-env/blob/137e648c117cf7058f921e4fa550ef94cce620d3/vm-setup/roles/v1aX_integration_test/tasks/verify.yml#L68
However, I start to doubt if this change has any impact because the replacement takes place in a comment.

cluster-api-provider-metal3/test/e2e/data/cni/calico/calico.yaml

Line 3684 in 6abef24

# value: "192.168.0.0/18"

Should we remove this change?

Copy link
Member

Choose a reason for hiding this comment

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

I am fine leaving it as is to be consistent with m3-dev-env task.

test/e2e/e2e_test.go Outdated Show resolved Hide resolved
test/e2e/pivoting_test.go
data, er := ioutil.ReadAll(outputPipe)
Expect(er).To(BeNil(), "Cannot get the stdout from the command")
if len(data) > 0 {
Logf("Output of the shell: %s\n", string(data))
Copy link
Member

Choose a reason for hiding this comment

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

maybe:

Suggested change
Logf("Output of the shell: %s\n", string(data))
Logf("Output of the shell: %v\n", string(data))

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 would use %s in this case because we want to print out a string

Copy link
Member

Choose a reason for hiding this comment

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

I asked because you have used %v a bit below for printing errorData string

test/e2e/yaml.go Outdated Show resolved Hide resolved
test/e2e/yaml.go Outdated Show resolved Hide resolved
@metal3-io-bot metal3-io-bot added the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Aug 31, 2021
@namnx228
Download calico manifest and update it
f319363
@namnx228
Add log for shell commands running in the e2e test
5a80b1f 
Fix


Fix lint fails


Fix the problem where cert-manager is required when installing BMO


Fix minor
@metal3-io-bot metal3-io-bot removed the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Sep 1, 2021
@namnx228
Copy link
Member Author

namnx228 commented Sep 1, 2021

/test-v1a5-e2e
/test-v1a5-centos-e2e
/test-integration

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kashifest

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2021
@kashifest kashifest mentioned this pull request Sep 1, 2021
Merged
@kashifest
Copy link
Member

/retitle Fix e2e calico configuration and BMO installation workflow

@metal3-io-bot metal3-io-bot changed the title Fix some e2e test problems Fix e2e calico configuration and BMO installation workflow Sep 1, 2021
@namnx228
Copy link
Member Author

namnx228 commented Sep 1, 2021

/hold

@metal3-io-bot metal3-io-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 1, 2021
@namnx228
Copy link
Member Author

namnx228 commented Sep 2, 2021

/hold cancel

@metal3-io-bot metal3-io-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 2, 2021
@fmuyassarov
Copy link
Member

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2021
@metal3-io-bot metal3-io-bot merged commit 73b8d11 into metal3-io:master Sep 2, 2021
@namnx228 namnx228 deleted the fix-e2e-no-networking-nam branch September 2, 2021 06:47
@fmuyassarov fmuyassarov mentioned this pull request Sep 2, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmuyassarov fmuyassarov fmuyassarov left review comments

@furkatgofurov7 furkatgofurov7 furkatgofurov7 left review comments

@kashifest kashifest kashifest approved these changes

Assignees

@furkatgofurov7 furkatgofurov7

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@namnx228 @metal3-io-bot @kashifest @fmuyassarov @furkatgofurov7