Remove resolve-ip dependency for integration-tests#9065
Merged
jon-wei merged 3 commits intoapache:masterfrom Dec 19, 2019
Merged
Remove resolve-ip dependency for integration-tests#9065jon-wei merged 3 commits intoapache:masterfrom
jon-wei merged 3 commits intoapache:masterfrom
Conversation
Contributor
Author
ccaominh
reviewed
Dec 18, 2019
| # limitations under the License. | ||
|
|
||
| DOCKER_HOST_IP="$(host "$(hostname)" | perl -nle '/has address (.*)/ && print $1')" | ||
| if [ "$DOCKER_HOST_IP" -eq "" ]; then |
Contributor
There was a problem hiding this comment.
I believe -eq is for numeric comparisons. To check for an empty string: [ -z "$DOCKER_HOST_IP" ]
Contributor
Author
There was a problem hiding this comment.
ahhh I thought shellcheck would yell at me if I used the wrong comparator type :(
| if [ "$DOCKER_HOST_IP" -eq "" ]; then | ||
| DOCKER_HOST_IP="$(dscacheutil -q host -a name "$(HOSTNAME)" | perl -nle '/ip_address: (.*)/ && print $1')" | ||
| fi | ||
| export DOCKER_HOST_IP |
Contributor
There was a problem hiding this comment.
Should we fail the script if DOCKER_HOST_IP is still empty here?
ccaominh
approved these changes
Dec 18, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Partially fixes #7842
Description
Remove the dependency on resolve-ip for the integration tests by using hostname instead
This PR has: