From 0255cb8cbeb562115ae44b3f5c646e3818b3b761 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 21 Jan 2020 15:21:46 +0100
Subject: [PATCH] Use python3.6 for engine lint jobs

Based on the suggestion below which is verified to work.

https://github.com/koalaman/shellcheck/issues/1803#issuecomment-576704573

Change-Id: I0572c4a1bd00c4f9bd277d1f8201db9c77677076
---
 jjb/cloud-infra/cloud-infra-verify-lint.yaml | 4 +++-
 jjb/cloud-infra/scripts/cloud-infra-lint.sh  | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jjb/cloud-infra/cloud-infra-verify-lint.yaml b/jjb/cloud-infra/cloud-infra-verify-lint.yaml
index 11bb74eb7..ddda0d80b 100644
--- a/jjb/cloud-infra/cloud-infra-verify-lint.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-lint.yaml
@@ -25,15 +25,17 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: false
 
     lint-type:
       - ansible-lint:
           repos-to-enable: 'infra\/engine|infra\/test|infra\/swconfig'
+          disabled: false
       - yamllint:
           repos-to-enable: 'infra\/engine|infra\/test|infra\/swconfig|infra\/hwconfig'
+          disabled: false
       - shellcheck:
           repos-to-enable: 'infra\/engine|infra\/test|infra\/swconfig'
+          disabled: false
 
     jobs:
       - 'cloud-infra-verify-{lint-type}-{stream}'
diff --git a/jjb/cloud-infra/scripts/cloud-infra-lint.sh b/jjb/cloud-infra/scripts/cloud-infra-lint.sh
index 73b06a5c9..68151d755 100644
--- a/jjb/cloud-infra/scripts/cloud-infra-lint.sh
+++ b/jjb/cloud-infra/scripts/cloud-infra-lint.sh
@@ -30,18 +30,18 @@ export DEBIAN_FRONTEND=noninteractive
 # install dependencies
 echo "Info: Install virtualenv python3-minimal using apt"
 sudo apt update -q=3 > /dev/null 2>&1
-sudo apt install -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -q=3 -y python3-minimal virtualenv > /dev/null 2>&1
+sudo apt install -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -q=3 -y python3.6-minimal python3-distutils virtualenv > /dev/null 2>&1
 
 # create and activate virtualenv
 echo "Info: Create and activate python virtualenv"
-virtualenv -p python3 .venv > /dev/null 2>&1
+virtualenv -p python3.6 .venv > /dev/null 2>&1
 set +u
 source .venv/bin/activate > /dev/null 2>&1
 set -u
 
 # install test-requirements
 echo "Info: Install python packages listed in test-requirements.txt using pip"
-pip install --quiet -r test-requirements.txt > /dev/null 2>&1
+pip install --force-reinstall --quiet -r test-requirements.txt > /dev/null 2>&1
 
 # set default lint type
 export LINT_TYPE="${LINT_TYPE:-ansible-lint}"
-- 
2.25.1