From 2d1dbd5e422673ca46b6a54e7df0400cb86257ee Mon Sep 17 00:00:00 2001 From: umarcor Date: Mon, 28 Dec 2020 21:46:06 +0100 Subject: ci: on ubuntu jobs, add temporary image with Python for testing 'pyunit' testsuite --- dist/ci-run.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'dist') diff --git a/dist/ci-run.sh b/dist/ci-run.sh index eb82c7e99..1db79fc34 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -424,6 +424,18 @@ ci_run () { else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl + case "$GHDL_IMAGE_TAG" in + *ubuntu*) + GHDL_TEST_IMAGE="test:$GHDL_IMAGE_TAG-py" + docker build -t "$GHDL_TEST_IMAGE" - <<-EOF +FROM ghdl/ghdl:$GHDL_IMAGE_TAG +RUN apt update -qq && apt install -y python +EOF + ;; + *) + GHDL_TEST_IMAGE="ghdl/ghdl:$GHDL_IMAGE_TAG" + ;; + esac # Run test in docker container tests="sanity pyunit" if [ "x$ISGPL" != "xtrue" ]; then @@ -434,7 +446,7 @@ ci_run () { tests="$tests synth" fi tests="$tests vpi" - $RUN "ghdl/ghdl:$GHDL_IMAGE_TAG" bash -c "GHDL=ghdl ./testsuite/testsuite.sh $tests" + $RUN "$GHDL_TEST_IMAGE" bash -c "GHDL=ghdl ./testsuite/testsuite.sh $tests" fi if [ ! -f testsuite/test_ok ]; then -- cgit v1.2.3