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.

Sign up for GitHub

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

Jump to bottom

Dockerfiles: Add git log when checking out from git #10819

Merged
merged 1 commit into from Apr 24, 2020
Merged

Dockerfiles: Add git log when checking out from git #10819

merged 1 commit into from Apr 24, 2020

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Apr 2, 2020 •
edited

For all of the commands we run in dockerfiles where we check out code
from git, we should run git remote -v and git log -1 so that in the logs of the docker
generation we can tell exactly which commit is checked out, and from where,
for that particular docker image, using only the docker build logs.

Update the cilium-runtime build steps for this.

@joestringer joestringer added pending-review kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. labels Apr 2, 2020
@joestringer joestringer requested review from aanm, ianvernon and a team as code owners April 2, 2020 00:13
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Apr 2, 2020
@joestringer
Copy link
Member Author

test-me-please

@coveralls
Copy link

coveralls commented Apr 2, 2020 •
edited

Coverage Status

Coverage decreased (-0.03%) to 44.625% when pulling c623e97 on joestringer:submit/docker-build-log-tracing into c9f94e7 on cilium:master.

aanm
aanm requested changes Apr 2, 2020
View reviewed changes
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

This requires an update of the runtime and builder image tags in quay.io; update these new tags in this PR; finally run the CI with these new tags.

errordeveloper
errordeveloper reviewed Apr 2, 2020
View reviewed changes
Dockerfile.builder Outdated Show resolved Hide resolved
@joestringer joestringer force-pushed the submit/docker-build-log-tracing branch 2 times, most recently from ecaf271 to e809d00 Compare April 2, 2020 22:43
@joestringer
Copy link
Member Author

Waiting on this build to tag: https://quay.io/repository/cilium/cilium-runtime/build/53f65119-ea0c-4326-b8de-e26117694865

@joestringer joestringer mentioned this pull request Apr 3, 2020
Closed
@joestringer joestringer force-pushed the submit/docker-build-log-tracing branch from e809d00 to ed560cd Compare April 3, 2020 07:27
@joestringer
Copy link
Member Author

test-me-please

@joestringer
Copy link
Member Author

restart-ginkgo

@joestringer
Copy link
Member Author

Hit #10882 which seems like a flake, unless the cilium-runtime image here is somehow pulling in something else that was merged but not yet part of the image. Will re-run ginkgo.

@joestringer
Copy link
Member Author

restart-ginkgo

@joestringer joestringer mentioned this pull request Apr 7, 2020
Closed
@joestringer
Copy link
Member Author

restart-ginkgo

@joestringer
Copy link
Member Author

Vagrant index problem:
https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/18622/execution/node/70/log/

@joestringer
Copy link
Member Author

restart-ginkgo

@aanm
Copy link
Member

aanm commented Apr 9, 2020

This PR conflicts with open PR #10912 in case one is merged the other needs to be rebased

@aanm aanm mentioned this pull request Apr 9, 2020
Merged
@joestringer
Copy link
Member Author

Hit #10882 on k8s-1.11 / net-next run again. Doesn't seem related to the changes made in this PR, so it seems like master is already broken :( More investigation necessary....

@joestringer
Copy link
Member Author

joestringer commented Apr 13, 2020 •
edited

restart-ginkgo

EDIT: Hit #10882 again, seems like it's reliably failing the same way. More likely it's an issue on master that was not yet resolved.

@joestringer joestringer removed the wip label Apr 15, 2020
@joestringer joestringer marked this pull request as draft April 15, 2020 02:43
@tklauser tklauser added dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. and removed conflicts-with-pr labels Apr 16, 2020
@joestringer
Dockerfiles: Add git log when checking out from git
c623e97 
For all of the commands we run in dockerfiles where we check out code
from git, we should run `git log -1` so that in the logs of the docker
generation we can tell exactly which commit is checked out and in use
for that particular docker image, using only the docker build logs.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer force-pushed the submit/docker-build-log-tracing branch from ed560cd to c623e97 Compare April 22, 2020 22:39
@joestringer joestringer removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 23, 2020
@joestringer joestringer marked this pull request as ready for review April 23, 2020 06:04
@joestringer
Copy link
Member Author

test-me-please

@joestringer joestringer requested a review from aanm April 23, 2020 23:21
@aanm aanm merged commit 65e3f1b into cilium:master Apr 24, 2020
1.8.0 automation moved this from In progress to Merged Apr 24, 2020
@joestringer joestringer deleted the submit/docker-build-log-tracing branch April 24, 2020 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@errordeveloper errordeveloper errordeveloper left review comments

@aanm aanm aanm approved these changes

@ianvernon ianvernon Awaiting requested review from ianvernon

Assignees
No one assigned
Labels
kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.8.0
  
Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@joestringer @coveralls @aanm @errordeveloper @tklauser