mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3931 from ThomasWaldmann/bionic 

vagrant: test on ubuntu 18.04, remove 16.04
This commit is contained in:
TW 2018-06-26 23:34:27 +02:00 committed by GitHub
parent 817c2b38a3 b3c7bb3758
commit cd4596d691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Vagrantfile vendored
View File

@ -9,20 +9,18 @@ $wmem = $xdistn * 256 # give the VM additional memory for workers [MB]
def packages_debianoid(user) def packages_debianoid(user)
return <<-EOF return <<-EOF
apt-get update apt update
# install all the (security and other) updates # install all the (security and other) updates
apt-get dist-upgrade -y apt dist-upgrade -y
# for building borgbackup and dependencies: # for building borgbackup and dependencies:
apt-get install -y libssl-dev libacl1-dev liblz4-dev libfuse-dev fuse pkg-config apt install -y libssl-dev libacl1-dev liblz4-dev libfuse-dev fuse pkg-config
usermod -a -G fuse #{user} usermod -a -G fuse #{user}
chgrp fuse /dev/fuse chgrp fuse /dev/fuse
chmod 666 /dev/fuse chmod 666 /dev/fuse
apt-get install -y fakeroot build-essential git apt install -y fakeroot build-essential git
apt-get install -y python3-dev python3-setuptools apt install -y python3-dev python3-setuptools python-virtualenv python3-virtualenv
# for building python: # for building python:
apt-get install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev apt install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev
easy_install3 'pip'
pip3 install 'virtualenv'
EOF EOF
end end
@ -209,16 +207,16 @@ Vagrant.configure(2) do |config|
v.cpus = $cpus v.cpus = $cpus
end end
config.vm.define "xenial64" do |b| config.vm.define "bionic64" do |b|
b.vm.box = "ubuntu/xenial64" b.vm.box = "ubuntu/bionic64"
b.vm.provider :virtualbox do |v| b.vm.provider :virtualbox do |v|
v.memory = 1024 + $wmem v.memory = 1024 + $wmem
end end
b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant")
b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant")
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("xenial64") b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("bionic64")
b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(true) b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(true)
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("xenial64") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bionic64")
end end
config.vm.define "stretch64" do |b| config.vm.define "stretch64" do |b|