Skip to content
Snippets Groups Projects
Commit f776ffa5 authored by Dario Faccin's avatar Dario Faccin
Browse files

Update Dockerfile and stage-test script to run tests for charms


This patch updates Dockerfile to use Ubuntu 20.04 as base for building
and testing charms.
This patch updates stage-test script to execute testing for charms.
Tests will be executed only for charms modified by the review.
This patch updates tox configuration for charms setting the python
interpreter to python3.8.

Change-Id: Ib9046b78d6520188cc51ac776fe60ea16479f11c
Signed-off-by: default avatarDario Faccin <dario.faccin@canonical.com>
parent be1ab182
No related branches found
No related tags found
No related merge requests found
......@@ -24,7 +24,7 @@
# devops-stages/stage-build.sh
#
FROM ubuntu:18.04
FROM ubuntu:20.04
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
......@@ -37,13 +37,13 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
debhelper \
dh-make \
git \
python3.8 \
python3 \
python3-all \
python3-dev \
python3-setuptools
RUN python3 -m easy_install pip==21.0.1
RUN pip3 install tox==3.22.0
RUN python3 -m easy_install pip==21.3.1
RUN pip install tox==3.24.5
ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8
......
......@@ -16,17 +16,16 @@
set -eu
if [ $(git diff --name-only origin/$GERRIT_BRANCH -- installers/charm/ |wc -l) -eq 0 ]; then
exit 0
fi
CURRENT_DIR=`pwd`
# Execute tests for charms
CHARM_PATH="./installers/charm"
CHARM_NAMES="keystone prometheus grafana"
CHARM_NAMES="osm-lcm osm-mon osm-nbi osm-ng-ui osm-pol osm-ro keystone prometheus grafana vca-integrator-operator"
for charm in $CHARM_NAMES; do
cd $CHARM_PATH/$charm
TOX_PARALLEL_NO_SPINNER=1 tox --parallel=auto
cd $CURRENT_DIR
if [ $(git diff --name-only "origin/${GERRIT_BRANCH}" -- "installers/charm/${charm}" | wc -l) -ne 0 ]; then
echo "Running tox for ${charm}"
cd "${CHARM_PATH}/${charm}"
TOX_PARALLEL_NO_SPINNER=1 tox -e lint,unit --parallel=auto
cd "${CURRENT_DIR}"
fi
done
......@@ -29,6 +29,7 @@ tst_path = {toxinidir}/tests/
all_path = {[vars]src_path} {[vars]tst_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
......@@ -29,6 +29,7 @@ tst_path = {toxinidir}/tests/
all_path = {[vars]src_path} {[vars]tst_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
......@@ -30,6 +30,7 @@ lib_path = {toxinidir}/lib/charms/osm_nbi
all_path = {[vars]src_path} {[vars]tst_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
......@@ -29,6 +29,7 @@ tst_path = {toxinidir}/tests
all_path = {[vars]src_path} {[vars]tst_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
......@@ -29,6 +29,7 @@ tst_path = {toxinidir}/tests/
all_path = {[vars]src_path} {[vars]tst_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
......@@ -30,6 +30,7 @@ lib_path = {toxinidir}/lib/charms/osm_ro
all_path = {[vars]src_path} {[vars]tst_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
......@@ -27,6 +27,7 @@ lib_path = {toxinidir}/lib/charms/osm_vca_integrator
all_path = {[vars]src_path} {[vars]tst_path} {[vars]lib_path}
[testenv]
basepython = python3.8
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/lib:{[vars]src_path}
PYTHONBREAKPOINT=ipdb.set_trace
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment