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

Ignore CPU clock for riscv64 #2364

Merged
merged 1 commit into from
Jan 7, 2020
Merged

Ignore CPU clock for riscv64 #2364

merged 1 commit into from
Jan 7, 2020

Conversation

carlosedp
Copy link
Contributor

Add riscv64 to clock speed ignore list.

@k8s-ci-robot
Copy link
Collaborator

Hi @carlosedp. Thanks for your PR.

I'm waiting for a google member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@dashpole
Copy link
Collaborator

dashpole commented Jan 6, 2020

/ok-to-test

Copy link
Collaborator

@dashpole dashpole left a comment

Choose a reason for hiding this comment

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

lgtm

@dashpole
Copy link
Collaborator

dashpole commented Jan 6, 2020

Strange... It failed with:

W0106 22:28:03.915] ++ git diff --name-only pages
W0106 22:28:03.979] + [[ ! -z pages/static/assets.go
W0106 22:28:03.980] pages/templates.go ]]
W0106 22:28:03.980] + echo 'Found changes to UI assets:'
W0106 22:28:03.980] + git diff --name-only pages
W0106 22:28:04.034] + echo 'Run: '\''make assets FORCE=true'\'''
W0106 22:28:04.034] + exit 1
I0106 22:28:04.134] Found changes to UI assets:
I0106 22:28:04.135] pages/static/assets.go
I0106 22:28:04.135] pages/templates.go
I0106 22:28:04.135] Run: 'make assets FORCE=true'

@dashpole
Copy link
Collaborator

dashpole commented Jan 6, 2020

I don't think this is your PR, as it has occurred in #2367 as well

@carlosedp
Copy link
Contributor Author

Yes, seems like a flaky one.

/test pull-cadvisor-e2e

@dashpole
Copy link
Collaborator

dashpole commented Jan 7, 2020

You will need to rebase on top of #2370 to fix the test.

@carlosedp
Copy link
Contributor Author

carlosedp commented Jan 7, 2020

Damn, I've cherry-picked instead of rebase... is that OK?

@dashpole
Copy link
Collaborator

dashpole commented Jan 7, 2020

I don't think that is what we want. There may be a quicker way to do it, but from your current state, you should be able to:

# undo the cherry-pick
git reset --hard  HEAD~ 
# if you haven't already set your upstream repo
git remote add upstream https://github.com/google/cadvisor.git
# fetch my changes, rebase, and push
git fetch upstream
git rebase upstream/master
git push origin riscv64

@carlosedp
Copy link
Contributor Author

Done... sorry about the noise ;)

@dashpole dashpole merged commit 64af920 into google:master Jan 7, 2020
@dashpole
Copy link
Collaborator

dashpole commented Jan 7, 2020

Its all good, thanks for your contribution!

@carlosedp
Copy link
Contributor Author

Thanks David!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants