PROD-36025 Switch venv_testrail_reporter to python3
Change-Id: I98728d4d34a7077d94be1390b5b1f3543fcd1999
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 7262caa..7207b84 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -156,7 +156,7 @@
common.printMsg("Running on: " + node_with_reports, "blue")
common.printMsg("Running on: " + env.NODE_NAME, "blue")
shared.verbose_sh("""\
- [ -d /home/jenkins/venv_testrail_reporter ] || virtualenv /home/jenkins/venv_testrail_reporter""", true, false, true)
+ [ -d /home/jenkins/venv_testrail_reporter ] || virtualenv --python=python3.7 /home/jenkins/venv_testrail_reporter""", true, false, true)
shared.run_cmd("""\
. /home/jenkins/venv_testrail_reporter/bin/activate; pip install git+https://github.com/dis-xcom/testrail_reporter -U""")
shared.swarm_testrail_report(steps, env.NODE_NAME)
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
index dd866a3..ba52899 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
@@ -265,7 +265,7 @@
deleteDir()
// Install TestRail reporter to upload test results to TestRail
shared.verbose_sh("""\
- [ -d /home/jenkins/venv_testrail_reporter ] || virtualenv /home/jenkins/venv_testrail_reporter
+ [ -d /home/jenkins/venv_testrail_reporter ] || virtualenv --python=python3.7 /home/jenkins/venv_testrail_reporter
""", true, false, true)
shared.run_cmd("""\
. /home/jenkins/venv_testrail_reporter/bin/activate; pip install git+https://github.com/dis-xcom/testrail_reporter -U
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud.env b/tcp_tests/templates/_heat_environments/eu-cloud.env
index 6303e88..bdcbc3a 100644
--- a/tcp_tests/templates/_heat_environments/eu-cloud.env
+++ b/tcp_tests/templates/_heat_environments/eu-cloud.env
@@ -44,5 +44,5 @@
vm_availability_zone: nova
net_public: public
- foundation_image: system.foundation
+ foundation_image: system.foundation01
nameservers: 172.18.176.6,172.18.224.6
diff --git a/tcp_tests/templates/_heat_environments/us-cloud.env b/tcp_tests/templates/_heat_environments/us-cloud.env
index bd62961..54556a8 100644
--- a/tcp_tests/templates/_heat_environments/us-cloud.env
+++ b/tcp_tests/templates/_heat_environments/us-cloud.env
@@ -44,5 +44,5 @@
vm_availability_zone: nova
net_public: public
- foundation_image: system.foundation
+ foundation_image: system.foundation01
nameservers: 172.18.224.6,172.18.176.6
diff --git a/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh b/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh
index cbf25d9..b949cfb 100644
--- a/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh
+++ b/tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh
@@ -9,7 +9,7 @@
virtualenv ${DEVOPS_VENV_PATH}
fi
if [ ! -d ${REPORT_VENV_PATH} ]; then
- virtualenv ${REPORT_VENV_PATH}
+ virtualenv --python=python3.7 ${REPORT_VENV_PATH}
fi
if [ ! -d ${TESTMARKER_VENV_PATH} ]; then
virtualenv --python=python3 ${TESTMARKER_VENV_PATH}
diff --git a/tcp_tests/templates/_packer/scripts/ubuntu_packets.sh b/tcp_tests/templates/_packer/scripts/ubuntu_packets.sh
index 883f620..2e59834 100644
--- a/tcp_tests/templates/_packer/scripts/ubuntu_packets.sh
+++ b/tcp_tests/templates/_packer/scripts/ubuntu_packets.sh
@@ -8,10 +8,18 @@
apt-get install -y libyaml-dev libffi-dev libvirt-dev python-dev pkg-config vlan bridge-utils python-pip python3-pip virtualenv
# additional tools
apt-get install -y ebtables curl ethtool iputils-ping lsof strace tcpdump traceroute wget iptables htop \
- git jq ntpdate tree mc byobu at pm-utils genisoimage iotop
+ git jq ntpdate tree mc byobu at pm-utils genisoimage iotop zlib1g zlib1g-dev libssl-dev
# ldap
apt-get install -y ldap-auth-client nscd ldap-utils
# update kernel
apt-get install -y linux-generic-hwe-16.04
+
+#install python3.7
+cd /usr/src
+wget https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tgz
+tar -xzvf Python-3.7.9.tgz
+cd Python-3.7.9
+./configure --enable-optimizations
+make altinstall