From a78697d4c2304ee4dcc56f3d8580a02d27dc00e1 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 3 Jun 2019 20:07:01 +0200 Subject: Override the right rally blacklists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Latest containers now leverage on python3.6. Change-Id: Ib3b3c02497b85dd210713baed345c4a64a0add5b Signed-off-by: Cédric Ollivier --- jjb/functest/functest.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 4a60c6484..c92e70d94 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -99,13 +99,18 @@ else image={repo}:{port}/{container}:{tag} fi + if [ "{tag}" = "latest" ]; then + py=3.6 + else + py=2.7 + fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ - -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\ + -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\ site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ $image run_tests -t {test} res=$? -- cgit 1.2.3-korg