X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=offline-installer-review.sh;h=4a8934e78282efd611904fdd5a61e2f02e04dcf8;hb=a3d76ebe1036cf779c0befbc37d046192a3dbc02;hp=3e011ea21dd5d42bcadde8622d1eca003a960a3a;hpb=87d77c49c517e3c85d85811f40e952892e555319;p=oom%2Foffline-installer.git

diff --git a/offline-installer-review.sh b/offline-installer-review.sh
index 3e011ea2..4a8934e7 100755
--- 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,17 +26,16 @@ 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() {
-  prep_ubuntu_16_04_for_molecule
   local roles=("$@")
   local MOLECULE_RC
   for role in ${roles[@]}
     do
-      if `find ${role} -name molecule.yml | grep -q '.*'`; then
+      if [ -f ${role}/molecule/default/molecule.yml ]; then
         ./ansible/test/bin/ci-molecule.sh ${role}
         MOLECULE_RC=$?
         if [ ${MOLECULE_RC} -ne "0" ]; then FAILED_ROLES+=(${role}); fi
@@ -49,8 +48,11 @@ function run_molecule() {
 #######################################################################$
 #                           MAIN                                      #$
 #######################################################################$
+echo "----------   ONAP OFFLINE INSTALLER - CHANGE VERIFICATION START   ----------"
 FAILED_ROLES=()
 ALL_PLAYBOOKS=(`ls -d ansible/test/play-*`) # enumerate all playbook tests for later usage
+# Setup environment
+prep_ubuntu_16_04_for_molecule > ubuntu_preparation.log
 
 # Check for changes in Ansible roles
 ROLE_CHANGES=(`git diff HEAD^ HEAD --name-only ansible/roles | cut -f 1-3 -d "/" | sort -u`)
@@ -134,3 +136,4 @@ else
   echo "Verification failed for ${FAILED_ROLES[*]}"
   exit 1
 fi
+echo "----------   ONAP OFFLINE INSTALLER - CHANGE VERIFICATION END   ----------"