[MOLECULE 3.3.0] Upgrade Molecule CI setup

This upgrades following packages to specified versions:

  - Molecule => 3.3.0
  - Ansible => 3.2.0
  - Python => 3.8

Change-Id: I1bba9b2691d0b9650a08ebf4ca749798080dd441
Issue-ID: OOM-2722
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/ansible/test/bin/ci-molecule.sh b/ansible/test/bin/ci-molecule.sh
index 98e69c7..6dbd93a 100755 (executable)
--- a/ansible/test/bin/ci-molecule.sh
+++ b/ansible/test/bin/ci-molecule.sh
@@ -2,7 +2,7 @@
 
 #   COPYRIGHT NOTICE STARTS HERE
 
-#   Copyright 2019-2020 © Samsung Electronics Co., Ltd.
+#   Copyright 2019-2021 © 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.
@@ -43,7 +43,7 @@ if [ "${MOLECULE_CONTAINER}" == "true" ]; then
 else # Install Molecule natively in the target platform
     echo "Install Molecule with virtualenv"
     source ${LOCAL_PATH}/../bin/install-molecule.sh
-    MOLECULE_BINARY=molecule
+    MOLECULE_BINARY="molecule --version"
 fi
 
 cd ${ROLE_PATH}

diff --git a/ansible/test/bin/install-molecule.sh b/ansible/test/bin/install-molecule.sh
index 4df0668..6108cc5 100755 (executable)
--- a/ansible/test/bin/install-molecule.sh
+++ b/ansible/test/bin/install-molecule.sh
@@ -2,7 +2,7 @@
 
 #   COPYRIGHT NOTICE STARTS HERE
 
-#   Copyright 2019 © Samsung Electronics Co., Ltd.
+#   Copyright 2019-2021 © 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.
@@ -33,7 +33,7 @@
 VENV_PATH=${VENV_PATH:-~/molecule_venv}
 
 # Create virtual env
-python3.6 -m venv ${VENV_PATH}
+python3.8 -m venv ${VENV_PATH}
 
 # Activate virtual env
 source ${VENV_PATH}/bin/activate
@@ -42,5 +42,5 @@ source ${VENV_PATH}/bin/activate
 if [ ! -z ${VIRTUAL_ENV} ]; then
     echo "Activated virtual env in ${VIRTUAL_ENV}"
     pip -q install -U pip
-    pip -q install pyopenssl molecule==2.20 ansible==2.7.8 ansible-lint==4.2.0 docker
+    pip -q install pyopenssl molecule==3.3.0 ansible==3.2.0 ansible-lint==5.0.7 docker molecule-docker==0.2.4
 fi

diff --git a/offline-installer-review.sh b/offline-installer-review.sh
index f60beed..4a8934e 100755 (executable)
--- a/offline-installer-review.sh
+++ b/offline-installer-review.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #   COPYRIGHT NOTICE STARTS HERE
 #
-#   Copyright 2018-2020 © Samsung Electronics Co., Ltd.
+#   Copyright 2018-2021 © 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.
@@ -26,8 +26,8 @@ function prep_ubuntu_16_04_for_molecule() {
   sudo apt-get --assume-yes install software-properties-common
   sudo add-apt-repository  --yes  ppa:deadsnakes/ppa
   sudo apt update
-  sudo apt install --assume-yes python3.6
-  sudo apt install --assume-yes python3.6-venv
+  sudo apt install --assume-yes python3.8
+  sudo apt install --assume-yes python3.8-venv
 }
 
 function run_molecule() {