Skip to content

Conversation

@mkenigs
Copy link
Contributor

@mkenigs mkenigs commented Mar 15, 2022

Created MCONamespace constant and used in all *.go files except for
test/helpers/utils.go which would create a cyclic import

Pulling out of #2987
Can't reopen #2982

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Mar 15, 2022

would a nolint:gocyclo solve the utils issue? for ex: 0c55518

@mkenigs
Copy link
Contributor Author

mkenigs commented Mar 15, 2022

I think it's a compilation issue not a linting issue:

$ make test-unit
CGO_ENABLED=0 go test -tags="containers_image_openpgp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_ostree_stub" -count=1 -v ./cmd/... ./pkg/... ./lib/...
# github.com/openshift/machine-config-operator/pkg/controller/common
package github.com/openshift/machine-config-operator/pkg/controller/common
	imports github.com/openshift/machine-config-operator/test/helpers: import cycle not allowed in test

@mkenigs
Copy link
Contributor Author

mkenigs commented Mar 15, 2022

Didn't look into eliminating the cycle

@kikisdeliveryservice
Copy link
Contributor

Gotcha 👍

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 15, 2022
@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Mar 15, 2022

Didn't look into eliminating the cycle

My suggestion was bogus (i tested) 😆 - the cycle is bc:
controller/common/helpers_test.go imports "github.com/openshift/machine-config-operator/test/helpers"

so imo it's fine as is.

@kikisdeliveryservice kikisdeliveryservice changed the base branch from master to layering March 15, 2022 23:46
@kikisdeliveryservice kikisdeliveryservice changed the base branch from layering to master March 15, 2022 23:46
@kikisdeliveryservice kikisdeliveryservice changed the base branch from master to layering March 16, 2022 01:04
@kikisdeliveryservice
Copy link
Contributor

/cherry-pick master

@openshift-cherrypick-robot

@kikisdeliveryservice: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

Details

In response to this:

/cherry-pick master

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.

@kikisdeliveryservice
Copy link
Contributor

/test e2e-gcp-op
/test e2e-agnostic-upgrade

@cgwalters
Copy link
Member

Overall looks sane to me but will defer final lgtm to @kikisdeliveryservice since she did more review.

Created MCONamespace constant and used in all *.go files except for
test/helpers/utils.go which would create a cyclic import
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 16, 2022

@mkenigs: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-op-single-node abda106 link false /test e2e-gcp-op-single-node
ci/prow/e2e-agnostic-upgrade 2472296152ebe99a58b587ce8ca7abd0160b0aa7 link true /test e2e-agnostic-upgrade
ci/prow/e2e-gcp-op 2472296152ebe99a58b587ce8ca7abd0160b0aa7 link true /test e2e-gcp-op
ci/prow/e2e-aws-upgrade abda106 link false /test e2e-aws-upgrade
ci/prow/e2e-gcp-single-node abda106 link false /test e2e-gcp-single-node

Full PR test history. Your PR dashboard.

Details

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.

@kikisdeliveryservice
Copy link
Contributor

ok let's try our new cherrypicking process!

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 17, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kikisdeliveryservice, mkenigs

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [kikisdeliveryservice]

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

@openshift-cherrypick-robot

@kikisdeliveryservice: new pull request created: #3025

Details

In response to this:

/cherry-pick master

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.

@mkenigs mkenigs deleted the MCONamespace branch March 18, 2022 13:48
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants