Skip to content

Conversation

@damemi
Copy link
Contributor

@damemi damemi commented May 28, 2020

Backports the changes from #24845 to add the openshift-tests run-resourcewatch command, to make this command available for upgrade e2es

@openshift-ci-robot
Copy link

@damemi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

[release-4.4] openshift-tests: add run-resourcewatch command

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.

@deads2k
Copy link
Contributor

deads2k commented May 29, 2020

@damemi try to get green please

@damemi damemi force-pushed the 4.4-backport-resourcewatch branch from 82eebc4 to f79da92 Compare May 29, 2020 20:55
@damemi
Copy link
Contributor Author

damemi commented Jun 1, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

@damemi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

/bugzilla 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.

@damemi damemi changed the title [release-4.4] openshift-tests: add run-resourcewatch command Bug 1842629: [release-4.4] openshift-tests: add run-resourcewatch command Jun 1, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label Jun 1, 2020
@openshift-ci-robot
Copy link

@damemi: This pull request references Bugzilla bug 1842629, which is invalid:

  • expected Bugzilla bug 1842629 to depend on a bug targeting a release in 4.5.0, 4.5.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

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

Details

In response to this:

Bug 1842629: [release-4.4] openshift-tests: add run-resourcewatch command

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 openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 1, 2020
@damemi
Copy link
Contributor Author

damemi commented Jun 1, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

@damemi: This pull request references Bugzilla bug 1842629, which is invalid:

  • expected dependent Bugzilla bug 1842631 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

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

Details

In response to this:

/bugzilla 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.

@damemi
Copy link
Contributor Author

damemi commented Jun 8, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 8, 2020
@openshift-ci-robot
Copy link

@damemi: This pull request references Bugzilla bug 1842629, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.4.z) matches configured target release for branch (4.4.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1842631 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1842631 targets the "4.5.z" release, which is one of the valid target releases: 4.5.0, 4.5.z
  • bug has dependents
Details

In response to this:

/bugzilla 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.

@damemi
Copy link
Contributor Author

damemi commented Jun 8, 2020

@deads2k this is finally ready to go, dependent 4.5 bug closed. If you can approve then we'll just need patch manager

- namespaces
- name: github.com/containerd/continuity
version: 0f16d7a0959cac64d7a54ce015e50cf4839d1970
version: d3ef23f19fbb106bb73ffde425d07a9187e30745
Copy link
Contributor

Choose a reason for hiding this comment

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

why did this change?

glide.lock Outdated
version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
- name: github.com/fsouza/go-dockerclient
version: f947194521d547b979882dc737b9e0a0c05a22d0
version: 60a2c3498a973746126e78bb9afe05636b17e533
Copy link
Contributor

Choose a reason for hiding this comment

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

why did this change

- name: github.com/mistifyio/go-zfs
version: cdc0f941c4d0e0e94d85348285568d921891e138
- name: github.com/mitchellh/go-homedir
version: af06845cf3004701891bf4fdb884bfe4920b3727
Copy link
Contributor

Choose a reason for hiding this comment

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

why did this change?

@damemi damemi force-pushed the 4.4-backport-resourcewatch branch from f79da92 to 7dba01a Compare June 10, 2020 14:16
@damemi
Copy link
Contributor Author

damemi commented Jun 10, 2020

@deads2k these glide.lock changes come from running make update-deps in a container after picking the code changes from the 4.5 PR. They're similar to the glide.lock changes in that PR (https://github.com/openshift/origin/pull/24845/files#diff-f16a80eae23d5b298c2652448ec420cf)

@damemi
Copy link
Contributor Author

damemi commented Jun 15, 2020

/retest

@mfojtik
Copy link
Contributor

mfojtik commented Jun 15, 2020

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 15, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damemi, mfojtik

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 15, 2020
@shawn-hurley shawn-hurley added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 25, 2020
@damemi
Copy link
Contributor Author

damemi commented Jun 26, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

7 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit f2dcd4b into openshift:release-4.4 Jun 26, 2020
@openshift-ci-robot
Copy link

@damemi: All pull requests linked via external trackers have merged: openshift/origin#25042. Bugzilla bug 1842629 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1842629: [release-4.4] openshift-tests: add run-resourcewatch command

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.

@damemi
Copy link
Contributor Author

damemi commented Jul 2, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot

@damemi: #25042 failed to apply on top of branch "release-4.3":

Using index info to reconstruct a base tree...
M	glide.lock
M	glide.yaml
M	vendor/github.com/containerd/continuity/.travis.yml
A	vendor/github.com/fsouza/go-dockerclient/.github/workflows/main.yml
A	vendor/github.com/fsouza/go-dockerclient/.golangci.yaml
M	vendor/github.com/fsouza/go-dockerclient/auth.go
M	vendor/github.com/fsouza/go-dockerclient/auth_test.go
M	vendor/github.com/fsouza/go-dockerclient/build_test.go
M	vendor/github.com/fsouza/go-dockerclient/client.go
M	vendor/github.com/fsouza/go-dockerclient/client_stress_test.go
M	vendor/github.com/fsouza/go-dockerclient/client_test.go
M	vendor/github.com/fsouza/go-dockerclient/client_unix_test.go
M	vendor/github.com/fsouza/go-dockerclient/container.go
M	vendor/github.com/fsouza/go-dockerclient/container_test.go
M	vendor/github.com/fsouza/go-dockerclient/exec_test.go
A	vendor/github.com/fsouza/go-dockerclient/go.mod
A	vendor/github.com/fsouza/go-dockerclient/go.sum
M	vendor/github.com/fsouza/go-dockerclient/image_test.go
A	vendor/github.com/fsouza/go-dockerclient/swarm_configs_test.go
A	vendor/github.com/fsouza/go-dockerclient/swarm_node_test.go
A	vendor/github.com/fsouza/go-dockerclient/swarm_secrets_test.go
A	vendor/github.com/fsouza/go-dockerclient/swarm_service_test.go
A	vendor/github.com/fsouza/go-dockerclient/swarm_task_test.go
M	vendor/github.com/fsouza/go-dockerclient/swarm_test.go
M	vendor/github.com/fsouza/go-dockerclient/testing/server.go
M	vendor/github.com/fsouza/go-dockerclient/testing/server_test.go
M	vendor/github.com/fsouza/go-dockerclient/testing/swarm.go
M	vendor/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash
A	vendor/github.com/fsouza/go-dockerclient/travis-scripts/win-setup.bash
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
M	vendor/github.com/openshift/api/config/v1/types_authentication.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/imageregistry/v1/types.go
A	vendor/github.com/openshift/library-go/go.mod
M	vendor/github.com/openshift/library-go/pkg/controller/controllercmd/cmd.go.git/rebase-apply/patch:6852: trailing whitespace.
<img src="https://upload.wikimedia.org/wikipedia/en/2/2b/Aerospike_logo.png" align="right"/> This is an example of a [go-git](https://github.com/src-d/go-git) repository backed by [Aerospike](http://www.aerospike.com/). 
.git/rebase-apply/patch:7018: trailing whitespace.
    
.git/rebase-apply/patch:4562: new blank line at EOF.
+
.git/rebase-apply/patch:31759: new blank line at EOF.
+
warning: 4 lines add whitespace errors.

M	vendor/github.com/openshift/library-go/pkg/controller/fileobserver/observer_polling.go
M	vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/core.go
M	vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/core_test.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/core_test.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/core_test.go
Auto-merging vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/core.go
Auto-merging vendor/github.com/openshift/library-go/pkg/controller/fileobserver/observer_polling.go
Auto-merging vendor/github.com/openshift/library-go/pkg/controller/controllercmd/cmd.go
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/go.mod deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/openshift/library-go/go.mod left in tree.
Auto-merging vendor/github.com/openshift/api/imageregistry/v1/types.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/imageregistry/v1/types.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_authentication.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_authentication.go
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash deleted in glide: add git library dependency and modified in HEAD. Version HEAD of vendor/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash left in tree.
Auto-merging vendor/github.com/fsouza/go-dockerclient/testing/swarm.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/testing/server_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/testing/server_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/testing/server.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/task_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/swarm_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/swarm_test.go
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/swarm_secrets_test.go deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/fsouza/go-dockerclient/swarm_secrets_test.go left in tree.
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/swarm_configs_test.go deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/fsouza/go-dockerclient/swarm_configs_test.go left in tree.
Auto-merging vendor/github.com/fsouza/go-dockerclient/service_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/service_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/node_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/image_test.go
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/go.sum deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/fsouza/go-dockerclient/go.sum left in tree.
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/go.mod deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/fsouza/go-dockerclient/go.mod left in tree.
Auto-merging vendor/github.com/fsouza/go-dockerclient/exec_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/exec_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/container_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/container_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/container.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/container.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/client_unix_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/client_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/client_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/client_stress_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/client.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/build_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/auth_test.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/auth_test.go
Auto-merging vendor/github.com/fsouza/go-dockerclient/auth.go
CONFLICT (content): Merge conflict in vendor/github.com/fsouza/go-dockerclient/auth.go
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/.golangci.yaml deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/fsouza/go-dockerclient/.golangci.yaml left in tree.
CONFLICT (modify/delete): vendor/github.com/fsouza/go-dockerclient/.github/workflows/main.yml deleted in HEAD and modified in glide: add git library dependency. Version glide: add git library dependency of vendor/github.com/fsouza/go-dockerclient/.github/workflows/main.yml left in tree.
Removing vendor/github.com/containerd/continuity/sysx/file_posix.go
Removing vendor/github.com/containerd/continuity/syscallx/syscall_windows.go
Removing vendor/github.com/containerd/continuity/syscallx/syscall_unix.go
Auto-merging vendor/github.com/containerd/continuity/.travis.yml
CONFLICT (content): Merge conflict in vendor/github.com/containerd/continuity/.travis.yml
Auto-merging glide.yaml
CONFLICT (content): Merge conflict in glide.yaml
Auto-merging glide.lock
CONFLICT (content): Merge conflict in glide.lock
error: Failed to merge in the changes.
Patch failed at 0001 glide: add git library dependency

Details

In response to this:

/cherry-pick release-4.3

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.

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. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants