Skip to content

Commit

Permalink
Merge pull request #73 from faberNovel/feature/ssh
Browse files Browse the repository at this point in the history
Feature/ssh
  • Loading branch information
vincentbrison authored Jun 12, 2020
2 parents 5729eec + 7130354 commit 9ec188d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
zlib1g-dev \
libssl-dev \
libreadline-dev \
unzip
unzip \
ssh

## Clean dependencies
RUN apt-get clean
Expand Down
2 changes: 1 addition & 1 deletion ci_cd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ fi
if [ "$test" = true ]; then
tasks=$((tasks+1))
echo "Testing image $full_image_name"
test_options="--android-api $android_api --android-build-tools $android_build_tools"
test_options="--check-base-tools --android-api $android_api --android-build-tools $android_build_tools"
if [ "$android_ndk" = true ]; then
test_options="$test_options --android-ndk"
fi
Expand Down
13 changes: 9 additions & 4 deletions tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ usage() {
echo " --android-ndk Test with NDK application"
echo " --android-api Tests apps compile and target SDK"
echo " --gcloud Tests if gcloud SDK was installed"
echo " --check-base-tools Test base tools setup like Java, Ruby and other"
echo " --android-build-tools Used android builds tools"
echo " --large-test Run large tests on the image (Firebase Test Lab for example)"
echo " --large-test Run large tests on the image (Firebase Test Lab for example)"
exit 1
}

Expand All @@ -26,6 +27,7 @@ while true; do
case "$1" in
--android-ndk ) android_ndk=true; shift ;;
--gcloud ) gcloud=true; shift ;;
--check-base-tools ) check_base_tools=true; shift ;;
--android-api ) android_api=$2; shift 2 ;;
--android-build-tools ) android_build_tools=$2; shift 2 ;;
--large-test ) large_test=true; shift ;;
Expand All @@ -41,10 +43,13 @@ if [ -z "$android_build_tools" ]; then
usage
fi

java -version
rbenv -v
if [ "$check_base_tools" = true ]; then
java -version
rbenv -v
ssh -V
fi

if [[ "$gcloud" = true ]]; then
if [ "$gcloud" = true ]; then
# Check if gcloud sdk is installed
gcloud --version
fi
Expand Down

0 comments on commit 9ec188d

Please sign in to comment.