Fix build #36
Fix build #36
Conversation
| RUN git clone https://github.com/bats-core/bats-core.git /tmp/bats-core && \ | ||
| /tmp/bats-core/install.sh /usr/local && \ | ||
| rm -r /tmp/bats-core |
There was a problem hiding this comment.
I couldn't find good documentation on the duggan/bats PPA, and it turns out that isn't supported on Ubuntu 20.04, so I switched to the officially recommended way to install bats.
| @@ -121,5 +121,5 @@ function os_change_dir_owner { | |||
| fi | |||
|
|
|||
| log_info "Changing ownership of $dir to $username" | |||
| "$exchown" -R "$username:$username" "$dir" | |||
| $exchown -R "$username:$username" "$dir" | |||
| } | |||
There was a problem hiding this comment.
Needed to remove "" here to ensure sudo BLAH was recognized as two command args and not one.
| @test "aws_wrapper_wait_for_instance_tags no tags" { | ||
| local reaodnly max_retries=1 | ||
| local readonly sleep_between_retries=0 | ||
| local readonly tags=$(cat <<END_HEREDOC | ||
| { | ||
| "Tags": [] | ||
| } | ||
| END_HEREDOC | ||
| ) | ||
|
|
||
| load_aws_mock "$tags" "" "" | ||
|
|
||
| run naws_wrapper_wait_for_instance_tags "i-1234567890abcdef0" "us-east-1" "$max_retries" "$sleep_between_retries" | ||
|
|
There was a problem hiding this comment.
This function was repeated for some reason.
| @@ -4,7 +4,7 @@ jobs: | |||
| machine: true | |||
| steps: | |||
| - checkout | |||
| - run: docker-compose up shellcheck | |||
| - run: docker-compose up --exit-code-from shellcheck shellcheck | |||
There was a problem hiding this comment.
Huh... What is the default exit code if you don't specify this?
There was a problem hiding this comment.
It's non-zero only if docker-compose has an error internally. Otherwise, it returns 0 regardless of the containers.
| working_dir: /usr/local/src/bash-commons | ||
| command: bats test | ||
| # Necessary so we can run a mock EC2 metadata service on port 80 on a special IP | ||
| privileged: true |
There was a problem hiding this comment.
Why is this only necessary for Ubuntu 20.04 and not any of the others?
There was a problem hiding this comment.
Oh you might have missed it because it's not in the change set, but the others have it too. I just copy pasted the whole routine from ubuntu18.
|
Thanks for review! I addressed the comments, and since they don't need code changes, I'll go ahead and merge this in! |
This PR includes several fixes:
s/local readonly/local -r/gI know this is a lot, so if necessary, I can break up the PR to separate out the fixes.