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

🐛 Use the infrastructure components built by m3-dev-env #293

Conversation

namnx228
Copy link
Member

@namnx228 namnx228 commented Sep 15, 2021

Currently, with e2e tests, the source cluster infrastructure components are initialized by the file made by m3-dev-env, while the target cluster uses the file that is built by the test framework itself. This causes a mismatch between the source and the target cluster.
This PR makes the e2e test framework use the infrastructure components issued by m3-dev-env, leading to the consistency between the source and target clusters.

Note: By default, m3-dev-env clones CAPM3 repo from upstream and build the infrastructure components from here. This behavior is not what we want in an e2e test because the components should be built from the local CAPM3 repo when the test is executed. Therefore, this PR switches the toggle that prevents m3-dev-env to clone repos. The test framework would copy the local CAPM3 repo and clone other repos to the directory where the dev-env works with. By doing that, m3-dev-env should build the infra components based on the local CAPM3 repo.

@namnx228
Copy link
Member Author

/assign @furkatgofurov7
/cc @kashifest
/test-integration
/test-v1a5-centos-e2e
/test-v1a5-e2e

@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from 5f8e5cf to edccdfc Compare September 15, 2021 14:22
@namnx228
Copy link
Member Author

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

1 similar comment
@namnx228
Copy link
Member Author

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

@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from edccdfc to 9ec699c Compare September 15, 2021 15:41
@namnx228
Copy link
Member Author

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

@namnx228
Copy link
Member Author

/test-integration
/test-v1a5-e2e

hack/e2e/environment.sh Outdated Show resolved Hide resolved
@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from 9ec699c to eb35120 Compare September 16, 2021 06:36
@namnx228
Copy link
Member Author

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

Copy link
Member

@kashifest kashifest left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 17, 2021
@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from eb35120 to 88ad58a Compare September 20, 2021 09:41
@metal3-io-bot metal3-io-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. labels Sep 20, 2021
@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from 88ad58a to 2e9e462 Compare September 20, 2021 09:47
@namnx228
Copy link
Member Author

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

Copy link
Member

@smoshiur1237 smoshiur1237 left a comment

Choose a reason for hiding this comment

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

LGTM

@namnx228
Copy link
Member Author

/test-v1a5-centos-e2e

@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from 2e9e462 to 43b6b7e Compare September 27, 2021 07:18
@namnx228
Copy link
Member Author

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

@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from 43b6b7e to c728364 Compare September 30, 2021 13:15
@metal3-io-bot metal3-io-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 30, 2021
@namnx228
Copy link
Member Author

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

@namnx228
Copy link
Member Author

/test-v1a5-e2e

@namnx228 namnx228 force-pushed the use-m3-dev-env-infrastructure-component-nam branch from c728364 to 24b580f Compare October 4, 2021 09:24
@namnx228
Copy link
Member Author

namnx228 commented Oct 4, 2021

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

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.

Minor suggestions, overall lgtm

@@ -31,6 +31,11 @@ export CONTROL_PLANE_MACHINE_COUNT='${CONTROL_PLANE_MACHINE_COUNT}'
# shellcheck disable=SC2016
export WORKER_MACHINE_COUNT='${WORKER_MACHINE_COUNT}'

# The e2e test framework would itself handle the cloning. It clones all the repos that are cloned in M3-DEV-ENV expect CAPM3.
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
# The e2e test framework would itself handle the cloning. It clones all the repos that are cloned in M3-DEV-ENV expect CAPM3.
# The e2e test framework would itself handle the cloning. It clones all the repos that are cloned in M3-DEV-ENV except CAPM3.

?

# Golang needs to be installed before cloning the needed repos to the Go source directory.
make install_requirements configure_host
# shellcheck disable=SC1091
source lib/common.sh
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if this is needed, we do source it in prev. step (01_* and 02_* scripts), no?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it is needed, otherwise it will fail. I have tested it.

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.

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furkatgofurov7, Rozzii, smoshiur1237

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 Oct 4, 2021
@kashifest
Copy link
Member

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2021
@metal3-io-bot metal3-io-bot merged commit 9af4f4f into metal3-io:master Oct 4, 2021
@namnx228 namnx228 deleted the use-m3-dev-env-infrastructure-component-nam branch October 4, 2021 12:15
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. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants