fix ci make target for dirs with spaces and netctl for kubeadm #292
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
chrisplo
force-pushed
the
fix_dirs_with_spaces
branch
3 times, most recently
from
4bb3605 to
eeb1b6f
Compare
|
build PR |
1 similar comment
|
build PR |
chrisplo
changed the title
chrisplo
force-pushed
the
fix_dirs_with_spaces
branch
from
2040d74 to
bb52cd4
Compare
|
build PR |
Signed-off-by: Chris Plock <[email protected]> fixing docker run
chrisplo
force-pushed
the
fix_dirs_with_spaces
branch
from
0571601 to
8a6ed8b
Compare
chrisplo
changed the title
|
build PR |
netctl used to be added in the minimal installer, but was removed. The binary is in the netplugin container that is run on every node, so instead of including it in the minimal installer, extract it from the container. Signed-off-by: Chris Plock <[email protected]>
chrisplo
force-pushed
the
fix_dirs_with_spaces
branch
from
8a6ed8b to
97512de
Compare
|
build PR |
chrisplo
changed the title
unclejack
approved these changes
Nov 7, 2017
|
@dseevr @neelimamukiri: Can you take a look at this, please? We should merge this with two reviews. |
|
#295 is needed to fix the CI. |
dseevr
reviewed
Nov 8, 2017
| mounts[5]="$src_conf_path:$container_conf_path:Z" | ||
| mounts[6]="-v" | ||
| mounts[7]="$(pwd)/contiv_cache:/var/contiv_cache:Z" | ||
| docker run --rm --net=host "${mounts[@]}" $image_name sh -c "./install/ansible/install.sh $netmaster_param -a \"$ans_opts\" $install_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param $cluster_param $v2plugin_param" |
| netplugin_version=$( | ||
| sed '/contiv_network_version/!d;s/.*\: \?"\(.*\)".*/\1/' \ | ||
| install/ansible/env.json) | ||
| docker rm netplugin-tmp >/dev/null 2>/dev/null || : |
There was a problem hiding this comment.
yeah, that's shorter,can change if the CI fails again
| @@ -45,7 +45,7 @@ cp -rf scripts/generate-certificate.sh $output_dir/install | |||
| chmod +x $output_dir/install/genInventoryFile.py | |||
There was a problem hiding this comment.
Do we need to quote everywhere$output_dir is used?
There was a problem hiding this comment.
output_dir is $(mktemp -d), which wont' have spaces . . unless TMPDIR is set and has spaces, for this PR, assuming it's not set to a dir with spaces
|
build PR |
1 similar comment
|
build PR |
dseevr
approved these changes
Nov 8, 2017
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.
No description provided.