diff options
| author | Runar Borge <runar@borge.nu> | 2019-09-27 21:49:30 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-09-27 21:49:30 +0200 |
| commit | 7e14af718d2356a7c0d69acfb1994b965660fb30 (patch) | |
| tree | 64b2d5f3eeb9de96040a7a29103727ae90b68c3a | |
| parent | 21db26a3e76aea73b12cf27b2ed88970db5a619a (diff) | |
| download | vyos-build-7e14af718d2356a7c0d69acfb1994b965660fb30.tar.gz vyos-build-7e14af718d2356a7c0d69acfb1994b965660fb30.zip | |
Testsuite: Move needed packages to Dockerfile insted of in the Jenkins pipeline
| -rw-r--r-- | Jenkinsfile | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 01887914..fcf0dafd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,7 +120,6 @@ pipeline { stage('Test') { steps { sh """ - sudo apt-get update && sudo apt-get install -y python3-pexpect qemu-kvm cd build/ sudo ../scripts/check-qemu-install --debug live-image-amd64.hybrid.iso """ diff --git a/docker/Dockerfile b/docker/Dockerfile index 1052a8e8..799b118d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -280,6 +280,11 @@ RUN apt-get update && apt-get install -y \ python2.7-dev \ libmariadb-dev +# Packages needed for Qemu test-suite +RUN apt-get update && apt-get install -y \ + python3-pexpect \ + qemu-kvm + # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ jq -r -M '.current_version')"; \ |