diff options
Diffstat (limited to 'ansible/test')
-rwxr-xr-x | ansible/test/bin/ci-molecule.sh | 9 | ||||
-rw-r--r-- | ansible/test/play-infrastructure/molecule/default/vars.yml | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ansible/test/bin/ci-molecule.sh b/ansible/test/bin/ci-molecule.sh index 7859c8dc..74296815 100755 --- a/ansible/test/bin/ci-molecule.sh +++ b/ansible/test/bin/ci-molecule.sh @@ -2,7 +2,7 @@ # COPYRIGHT NOTICE STARTS HERE -# Copyright 2019 © Samsung Electronics Co., Ltd. +# Copyright 2019-2020 © Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ # COPYRIGHT NOTICE ENDS HERE # -# This is a main wrapper script to run Molecule tests -# Main usage is for the CI usage to keep interface stable and the way to call +# This is a main wrapper script to run Molecule tests. +# Main usage is for the CI to keep interface stable and the way to call # Molecule can be adjusted in this script independently. # @@ -40,7 +40,6 @@ if [ "${MOLECULE_CONTAINER}" == "true" ]; then echo "Build Molecule-dev docker container" ${LOCAL_PATH}/../molecule-docker/build.sh MOLECULE_BINARY=${LOCAL_PATH}/../bin/molecule.sh - else # Install Molecule natively in the target platform echo "Install Molecule with virtualenv" source ${LOCAL_PATH}/../bin/install-molecule.sh @@ -50,5 +49,5 @@ fi cd ${ROLE_PATH} ${MOLECULE_BINARY} --version ${MOLECULE_BINARY} test --all +docker volume prune --force cd - - diff --git a/ansible/test/play-infrastructure/molecule/default/vars.yml b/ansible/test/play-infrastructure/molecule/default/vars.yml index 8aa774b4..2ae49d95 100644 --- a/ansible/test/play-infrastructure/molecule/default/vars.yml +++ b/ansible/test/play-infrastructure/molecule/default/vars.yml @@ -1,5 +1,4 @@ --- -vnc_passwd: molecule certificates: organization_name: Molecule Testers state_or_province_name: Finland @@ -22,3 +21,4 @@ runtime_images: registry: "{{ molecule_test_registry }}" path: "/library/alpine" tag: "latest" +vnc_server_image: alpine:latest |