diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2017-11-28 23:53:37 +0100 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-11-30 23:00:28 +0100 |
| commit | b87bb4cab9ad0ad5ffce652ef2fc2a4f1f4a1d8f (patch) | |
| tree | 508c43225bc184b825254efba6476a2356a33dc5 | |
| parent | 56704dbe906901e4d22ef03affd7b64e4975b7ef (diff) | |
[test] install gnupg1 and haveged for the e2e test
Since we are using artful for the tests it comes with gnupg2 and breaks
the e2e tests.
Also install haveged to speed up e2e tests.
- Resolves: #9159
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | tests/docker/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d56e8d7..c3a8d799 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ e2e_tests: dependencies: - linux_test script: - - dpkg -l tox > /dev/null || apt-get -y --no-install-recommends install tox + - dpkg -l tox gnupg1 haveged > /dev/null || apt-get -y --no-install-recommends install tox gnupg1 haveged - tox -e py27-dev --notest - source .tox/py27-dev/bin/activate - make dev-latest-backend diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 0712ba7c..12a5b142 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && \ git swaks uuid-runtime \ openvpn policykit-1 lxpolkit \ wget patchelf libusb-0.1-4 \ - xvfb \ + xvfb gnupg1 haveged \ # needed for chromedriver libgconf-2-4 chromium-browser unzip |