Since #8399 was closed I'm reverting this change, hopefully that'll also fix travis #11643
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@soltysh can you leave the commit as it would be created with |
|
Will do right away. |
This reverts commit b8fe224.
if grep -q 'no Docker socket found' "${LOG_DIR}/openshift.log" && command -v journalctl >/dev/null 2>&1; then
# the Docker daemon crashed, we need the logs
journalctl --unit docker.service --since -4hours > "${LOG_DIR}/docker.log"
fi |
|
@soltysh make a second commit and diff --git a/hack/util.sh b/hack/util.sh
index 24f5a66..63606ef 100644
--- a/hack/util.sh
+++ b/hack/util.sh
@@ -269,7 +269,7 @@ function cleanup_openshift() {
set -u
fi
- if grep -q 'no Docker socket found' "${LOG_DIR}/openshift.log"; then
+ if grep -q 'no Docker socket found' "${LOG_DIR}/openshift.log" && command -v journalctl >/dev/null 2>&1; then
# the Docker daemon crashed, we need the logs
journalctl --unit docker.service --since -4hours > "${LOG_DIR}/docker.log"
fi |
|
LGTM @danmcp please tag for merge |
|
[merge] |
|
Evaluated for origin merge up to 94ba9cf |
|
[Test]ing while waiting on the merge queue |
|
Evaluated for origin test up to 94ba9cf |
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10795/) (Base Commit: 4e99352) |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10822/) (Base Commit: 0a7ab27) (Image: devenv-rhel7_5273) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@stevekuznetsov that's what was wrong, mind taking a look?