diff options
| author | Kenneth Hsu <kennethhsu@gmail.com> | 2021-01-10 00:22:19 +0300 |
|---|---|---|
| committer | Kenneth Hsu <kennethhsu@gmail.com> | 2021-01-10 05:45:14 +0300 |
| commit | 5ef1857235282316a6cda5d9b8f712d9407d86d8 (patch) | |
| tree | 20651d725a6978a742b84c4dae42c2ea43c791d0 | |
| parent | e55662961c641c79cccba3deaa20072308136368 (diff) | |
Use included mono version in integration tests.
The latest selenium/standalone-firefox image is based on Ubuntu 20.04,
which has support for mono 6.8.0.105.
| -rwxr-xr-x | pipeline/stage_integrationtests/job.sh | 10 | ||||
| -rwxr-xr-x | pipeline/stage_integrationtests/trigger.sh | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/pipeline/stage_integrationtests/job.sh b/pipeline/stage_integrationtests/job.sh index 1ed61d7a8..2862170f0 100755 --- a/pipeline/stage_integrationtests/job.sh +++ b/pipeline/stage_integrationtests/job.sh @@ -2,15 +2,6 @@ . /pipeline/docker-run/markers.sh . /pipeline/shared/duplicati.sh -# The version of mono available within the selenium docker image is too old so -# we will install the latest version. -function update_mono () { - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF - echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list - sudo apt update - sudo apt install -y mono-complete -} - function start_test () { pip3 install selenium pip3 install --upgrade urllib3 @@ -27,6 +18,5 @@ function start_test () { } travis_mark_begin "INTEGRATION TESTING" -update_mono start_test travis_mark_end "INTEGRATION TESTING" diff --git a/pipeline/stage_integrationtests/trigger.sh b/pipeline/stage_integrationtests/trigger.sh index 5e6967fa8..00414e27f 100755 --- a/pipeline/stage_integrationtests/trigger.sh +++ b/pipeline/stage_integrationtests/trigger.sh @@ -1,7 +1,7 @@ #!/bin/bash . error_handling.sh -PACKAGES="python3-pip rsync" +PACKAGES="python3-pip rsync mono-complete" docker-run --image selenium/standalone-firefox \ --packages "$PACKAGES" \ --asroot \ |