Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

chrony-service: re-patch PR#265#339

Merged
amshinde merged 1 commit intokata-containers:masterfrom
Pennyzct:chrony_only_on_x86-64
Aug 1, 2019
Merged

chrony-service: re-patch PR#265#339
amshinde merged 1 commit intokata-containers:masterfrom
Pennyzct:chrony_only_on_x86-64

Conversation

@Pennyzct
Copy link
Copy Markdown
Contributor

@Pennyzct Pennyzct commented Aug 1, 2019

commit 39370c2 has accidentally deleted the content in #265
Here, I just re-patch PR#265 on the latest master code.

Fixes: #338

Signed-off-by: Archana Shinde archana.m.shinde@intel.com
Signed-off-by: Penny Zheng penny.zheng@arm.com

commit 39370c2(https://github.com/kata-containers/osbuilder/commit/
39370c2) has accidentally deleted the
content in PR#265(kata-containers#265).
Here, I just re-patch PR#265 on the latest master code.

Fixes: kata-containers#338

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
Signed-off-by: Penny Zheng <penny.zheng@arm.com>
Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

Thanks @Pennyzct !

Ouch - yes I see that #312 inadvertently deleted that change now (GitHub "helpfully" didn't show the rootfs-builder/rootfs.sh changes by default as too big :)

/cc @marcov

@jodh-intel
Copy link
Copy Markdown

/test

@grahamwhaley
Copy link
Copy Markdown
Contributor

Better check with @marcov that the original delete was not intentional (I think it was not... but... ;-) )

@Pennyzct
Copy link
Copy Markdown
Contributor Author

Pennyzct commented Aug 1, 2019

@jodh-intel Ahhhhh, that explained why I spent the whole morning searching repo with chrome and couldn't find the commit. I really need to learn how to use git to do the search.

@jodh-intel
Copy link
Copy Markdown

@Pennyzct - yes, git is the best way. But there is a bit of indirection since you can't search for the PR number (although you can search for the issue ;)

What I generally do is:

  • Run git log -p to show the commits and the changes.
  • Search (using /) for one of the the lines that is removed (in red) - for example chrony_systemd_service=.
  • Then, search backwards (using ?) for ^commit to find the closest commit to that which should have the Fixes #XXX comment.

@Pennyzct
Copy link
Copy Markdown
Contributor Author

Pennyzct commented Aug 1, 2019

travis on ppc64le timed out.

$ .ci/setup.sh
$ travis_wait 50 .ci/run.sh


Still running (48 of 50): .ci/run.sh

The job exceeded the maximum time limit for jobs, and has been terminated.

any idea? @nitkon

@chavafg
Copy link
Copy Markdown
Contributor

chavafg commented Aug 1, 2019

Weird that ARM job passed on #312, seems like it tested master instead of the PR?

@chavafg
Copy link
Copy Markdown
Contributor

chavafg commented Aug 1, 2019

ohh, nevermind, the thing is that this workflow does not run the docker check dmesg logs errors test

@chavafg
Copy link
Copy Markdown
Contributor

chavafg commented Aug 1, 2019

I've restarted the firecracker and travis job which timed out.

@amshinde
Copy link
Copy Markdown
Member

amshinde commented Aug 1, 2019

Restarting travis

@nitkon
Copy link
Copy Markdown
Contributor

nitkon commented Aug 1, 2019

@Pennyzct: Yes, observed this in other projects as well. For some reason, Travis ppc64le CI runs are timing out today.

@nitkon
Copy link
Copy Markdown
Contributor

nitkon commented Aug 1, 2019

So it's all green now!

@amshinde amshinde merged commit dd40af2 into kata-containers:master Aug 1, 2019
@marcov
Copy link
Copy Markdown
Contributor

marcov commented Aug 2, 2019

Thank you for the catch @Pennyzct. That was a rebasing mistake.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Arm CI failed on commit 39370c2

8 participants