Commit Graph

217 Commits

Author SHA1 Message Date
Thomas Waldmann c2cc7223ae vagrant: use a FreeBSD 12.1 box 2020-04-19 20:46:24 +02:00
Thomas Waldmann 49e21b2754 vagrant: fixes for freebsd 12.1 2020-04-18 22:59:13 +02:00
Thomas Waldmann dd070c05c9 vagrant: fix debianoid virtualenv packages
there is no python-virtualenv on focal64,
but "virtualenv" installs everything needed.
2020-04-18 21:48:04 +02:00
Rémi Oudin dc22694e6d
Remove the flake8 test for Vagrant VMs
This is tested after each commit so this test is quite useless on the
Vagrant VMs.
2020-04-11 14:21:32 +02:00
Thomas Waldmann f5097bc451 vagrant: macOS: avoid error if pkg is already installed 2020-04-10 18:51:36 +02:00
Thomas Waldmann 76697a6b93 vagrant: debianoid: don't interactively ask questions 2020-04-10 18:46:27 +02:00
Thomas Waldmann 6e44e46f40 add a debian buster and a ubuntu focal VM 2020-03-09 22:00:57 +01:00
Thomas Waldmann c40bba3cbd vagrant: upgrade pyinstaller to v3.5 + patch
the patch is needed so it works with recent virtualenv.
2019-11-27 01:36:05 +01:00
Thomas Waldmann e91d9cd17e vagrant: fix issue in stretch VM hanging at grub installation 2019-11-27 01:32:31 +01:00
Thomas Waldmann 24eff82571 vagrant: use py369 for binary build, add py380 for tests 2019-11-26 19:05:17 +01:00
Thomas Waldmann 7a175d79b6 vagrant: add up-to-date openindiana box (py35, openssl10) 2019-06-17 02:49:56 +02:00
Thomas Waldmann 90ef4a82a2 vagrant: build python and borg with openssl 1.1
we need to use py 3.5.3 to support openssl 1.1.

we also would need at least 3.6.7 to have pyenv switch to openssl 1.1,
but as we also use the latest 3.6 (3.6.8 currently) for building the
binary, we just use that for tests also.
2019-04-21 20:23:18 +02:00
Thomas Waldmann d10684e39f Vagrantfile: add zstd, reorder, build env vars, fixes #4444 2019-03-16 01:56:22 +01:00
Thomas Waldmann 29c1f4e895 vagrant: fix freebsd box name 2019-03-02 19:58:37 +01:00
Thomas Waldmann 29735b26c0 vagrant: add a openbsd 6.4 box 2019-03-01 18:29:11 +01:00
Thomas Waldmann cecea99a0e vagrant: darwin: upgrade OS 10.10 -> 10.12 2019-03-01 15:46:43 +01:00
Thomas Waldmann 08574d08f8 vagrant: darwin: add zstd 2019-03-01 15:46:43 +01:00
Thomas Waldmann e549333bd5 vagrant: upgrade osxfuse 3.8.2 -> 3.8.3 2019-03-01 15:46:43 +01:00
Thomas Waldmann eb0869a4f6 vagrant: upgrade py 3.5.0 -> 3.5.3 due to openssl 1.1 compatibility 2019-03-01 15:46:43 +01:00
Thomas Waldmann 53ab22a3b3 vagrant: upgrade py 3.6.7 -> 3.6.8 2019-03-01 15:46:37 +01:00
Thomas Waldmann 63ed2f6d7a new freebsd12 64bit vagrant box, fixes #4399
note:
- openssl 1.1.1 seems to be part of base install
- added zstd compression lib
2019-02-28 21:37:35 +01:00
Thomas Waldmann a796ecbe9d for now, use old freebsd64 vagrant box for testing
the freebsd12-amd64 one is broken due to some pkg vs. openssl111 issue.
2019-02-24 14:51:22 +01:00
Thomas Waldmann 15695205a1 Vagrantfile: use python 3.6.7 for binary building 2018-12-15 21:39:52 +01:00
Thomas Waldmann 042dfa0c73 Vagrantfile: add python 3.5.0 for testing 2018-12-15 21:37:43 +01:00
Thomas Waldmann 2be5446098 Revert "drop support for python 3.5, fixes #3919"
This reverts commit 55314f807e.
2018-12-11 00:53:43 +01:00
Thomas Waldmann 8b61f21c29 vagrant: use osxfuse 3.8.2 2018-08-11 14:31:01 +02:00
Thomas Waldmann 578ac64385 vagrant: add py37 for testing 2018-07-31 23:16:08 +01:00
Thomas Waldmann 0ed15081ad vagrant: fix arch package installation 2018-07-07 00:55:28 +02:00
Thomas Waldmann 3a121ea76b vagrant: fix FreeBSD 12, add Darwin 2018-07-04 02:51:04 +02:00
Thomas Waldmann ebbeeec241 vagrant: use pyinstaller v3.3.1
the fix that i made in v3.3-fixed is also in official release v3.3.1.
2018-07-03 21:09:08 +02:00
Thomas Waldmann 55314f807e drop support for python 3.5, fixes #3919
if you do not have python 3.6.x, you can still use borg 1.1.x or 1.0.x.

another option is to use the fat binary from github releases, which
includes python 3.6 and all other stuff needed.
2018-06-30 21:02:19 +02:00
Thomas Waldmann 55ac6a6d9e vagrant: use python 3.6.6 2018-06-28 17:59:34 +02:00
Thomas Waldmann 440f7646ac vagrant: stretch64: use pyenv to test on py36 2018-06-27 01:44:44 +02:00
Thomas Waldmann b3c7bb3758 vagrant: test on ubuntu 18.04, remove 16.04 2018-06-26 23:27:35 +02:00
Thomas Waldmann 6bc731dde6 vagrant: test on freebsd 12 2018-06-23 03:31:25 +02:00
Thomas Waldmann a4952c8fe0 vagrant: arch64 VM: generate and set en_US.UTF-8 locale 2018-06-23 00:17:10 +02:00
Thomas Waldmann 7e59a6c229 vagrantfile fixes (fwd port to master) 2018-06-08 09:01:25 +02:00
Thomas Waldmann 4e5a30189b vagrant: use "vagrant" as username for new xenial box 2018-05-18 19:24:14 +02:00
Thomas Waldmann 798cbf7a66 vagrant: suppress any error msgs from __pycache__/.tox cleanup 2018-05-18 19:20:57 +02:00
Thomas Waldmann 4cffed8334 vagrant: update to Python 3.6.5 (for binary builds) 2018-05-18 19:18:15 +02:00
TW 024c9578ce
Merge pull request #3717 from milkey-mouse/fix-3706-fp1.2
Vagrant: move cleanup steps to fs_init (1.2 forward-port)
2018-03-24 21:37:35 +01:00
Thomas Waldmann 6b42562c8c
Vagrant: move cleanup steps to fs_init, fixes #3706
so after a vagrant up or vagrant reload (which both rsync), we
can just call the fs_init and run_tests provisioning steps and do
not need to call install_borg again.
2018-03-24 11:49:49 -07:00
Thomas Waldmann 53aae94a5a
Vagrant: xenial64 box now uses username 'vagrant', fixes #3707 2018-03-24 11:30:06 -07:00
TW ed36839f96 Merge pull request #3057 from ThomasWaldmann/pyi-use-py36
use Python 3.6.2 for the pyinstaller binary
2017-09-24 22:16:32 +02:00
Thomas Waldmann 2ee068317c use Python 3.6.2 for the pyinstaller binary 2017-09-24 22:15:07 +02:00
Thomas Waldmann eaa1290502 pyinstaller: use v3.3, fetch from v3.3-fixed branch 2017-09-24 22:01:33 +02:00
Thomas Waldmann 507203a759 use python 3.5.4 to build the binaries 2017-09-22 02:52:00 +02:00
Thomas Waldmann ebb4eaed5a vagrant: clean up shell profile init, user name (master)
- deduplicated .bash_profile creation
- now we always have XDISTN=... and LANG=... (not just for pyenv)
- username is just given where needed ("ubuntu" vs "vagrant")
- override for cygwin not needed as init is not global any more
2017-09-04 21:33:23 +02:00
Thomas Waldmann 7dc76a7f40 vagrant: add archlinux VM
has python 3.6, openssl 1.1.

and most of the stuff we need is preinstalled on this box. \o/
2017-08-01 04:46:31 +02:00
Thomas Waldmann 074beec1ca minimal Vagrantfile (py3.5+, openssl 1.0/1.1)
- killed many VMs that missed python 3.5 and/or openssl 1.1
- refer to 1.1-maint branch Vagrantfile if you want to re-add some
- kept xenial64 for openssl 1.0 testing
- kept stretch64 for openssl 1.1 testing and future binary builds
2017-07-30 02:01:10 +02:00
Thomas Waldmann a5c6a50ebe increase Python minimum requirement to 3.5.0
also:
- drop testing on 3.4
- add some TODO for the docs and vagrant machines
2017-07-29 20:55:04 +02:00
Thomas Waldmann f2472b2fb6 upgrade FUSE for macOS (osxfuse) from 3.5.8 to 3.6.3, fixes #2706 2017-07-21 22:52:15 +02:00
TW f3fc546c9d Merge pull request #2742 from htgoebel/patch-2
Vagrantfile: Fix set-up of cygwin and its sshd.
2017-06-25 17:34:06 +02:00
TW ec4958fb1c Merge pull request #2740 from ThomasWaldmann/fuse-writing
FUSE vs. fuse
2017-06-25 00:37:09 +02:00
Hartmut Goebel 045a676825 Vagrantfile: cygwin: Fix installation of pip.
cygwin is at python-3.6 now. Use version-independent `ensurepip`
to be future-proof.
2017-06-24 19:44:36 +02:00
Hartmut Goebel f962659f11 Vagrantfile: cygwin: Prepend cygwin PATH.
Otherwise crippled programs of the pre-installed MLS-OpenSSHd's path
hide the cygwin programs.
2017-06-24 19:22:39 +02:00
Hartmut Goebel 54a60c5fc8 Vagrantfile: cygwin: Fix permissions as required by sshd. 2017-06-24 17:46:20 +02:00
Hartmut Goebel b09e4eff86 Vagrantfile: cygwin: Run setup after setting PATH
Fixes #2609.
2017-06-24 17:46:20 +02:00
Hartmut Goebel 26c92256e2 Vagrantfile: Fix cygwin mirror URL.
mirrors.kernel.org no longer offers ftp.
2017-06-24 09:14:41 +02:00
Thomas Waldmann 7ebad4f803 FUSE vs. fuse 2017-06-24 01:24:14 +02:00
Thomas Waldmann 379378fbba vagrant: add Debian 9 "stretch" 64bit 2017-06-18 18:07:45 +02:00
Thomas Waldmann dff5f2041e vagrant: add OpenIndiana 2017-06-12 03:29:37 +02:00
Thomas Waldmann a6dc6b611b Vagrantfile: backslash needs escaping 2017-06-12 03:04:31 +02:00
enkore b06ceb6547 Revert "Start fakeroot faked in debug mode - fixes EISDIR issues" 2017-06-03 22:02:52 +02:00
Thomas Waldmann 9b35fa1d39 vagrant: update cleaning 2017-06-02 06:12:30 +02:00
Thomas Waldmann a4729097cc vagrant: fix openbsd shell 2017-06-02 02:45:07 +02:00
Thomas Waldmann 16a296c11a vagrant: control VM cpus and pytest workers via env 2017-06-02 02:34:12 +02:00
Lee Bousfield 3e24ed4035 Start fakeroot faked in debug mode 2017-05-04 00:18:17 -06:00
Thomas Waldmann 5ffb66fdd5 upgrade FUSE for macOS to 3.5.8, fixes #2346 2017-04-27 01:34:53 +02:00
Thomas Waldmann 963949812d vagrant: increase memory for parallel testing
considering that we run pytest-xdist with 4 parallel processes,
we need a bit more RAM to avoid the OOM killer and MemoryError.

so, 1GiB for 32bit, 1.5GiB for 64bit VMs.
2017-03-27 12:38:19 +02:00
Thomas Waldmann c0dc644ef6 Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
#	MANIFEST.in
#	Vagrantfile
#	docs/changes.rst
#	docs/usage/mount.rst.inc
#	src/borg/archiver.py
#	src/borg/fuse.py
#	src/borg/repository.py
2017-01-29 05:49:53 +01:00
Thomas Waldmann f74b533d6d vagrant: improve darwin64 VM settings
somehow without these cpuid settings it does not work for everybody.
also nice if we can get away without the extensions pack, which is proprietary.
do not update iTunes, we just want the OS security / bugfix updates
2017-01-28 16:56:14 +01:00
Thomas Waldmann 74c33463dc vagrant freebsd: some fixes, fixes #2067
- use -RELEASE, it can be updated via binaries
- more RAM, otherwise the 4 workers run out of memory.
- do not install / use fakeroot, it seems broken.
- set a hostname, this VM has none
2017-01-20 02:59:36 +01:00
Thomas Waldmann 7b9ff75960 use osxfuse 3.5.4 for tests / to build binaries 2017-01-19 19:02:13 +01:00
Thomas Waldmann 2b6e8a19e3 use python 3.5.3 to build binaries, fixes #2078 2017-01-19 18:58:14 +01:00
Thomas Waldmann cdffd93139 pyinstaller: use fixed AND freshly compiled bootloader, fixes #2002 2017-01-17 02:09:28 +01:00
Thomas Waldmann 007d4797d8 pyinstaller: automatically builds bootloader if missing 2017-01-16 08:10:08 +01:00
Thomas Waldmann 1c3ec747d0 upgrade pyinstaller from 3.1.1+ to 3.2.1 2017-01-16 06:31:12 +01:00
Thomas Waldmann 740312f725 Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
#	requirements.d/development.txt
#	tox.ini
2017-01-15 01:15:04 +01:00
Thomas Waldmann a9cd6a09cb fix the freebsd64 vagrant machine, fixes #2037
The previous 10.2 got unusable due to missing backwards compatibility of 10.3 binaries it installed.
The 10.3 box from freebsd project has some issues:
- it needs "vagrant up" twice to start (first start with MAC warning)
- it needs shell set to sh
2017-01-14 23:42:38 +01:00
Thomas Waldmann 70cc201377 Merge branch '1.0-maint' into merge-1.0-maint 2017-01-14 16:53:38 +01:00
Thomas Waldmann 00c7a4f886 vagrant: fix openbsd repo, fixes #2042
original repo is 404.
2017-01-14 14:12:39 +01:00
Marian Beermann ecad0ed53a Merge branch '1.0-maint' into merge/1.0-maint
# Conflicts: ... everywhere ...
#	.travis.yml
#	Vagrantfile
#	borg/testsuite/key.py
#	docs/changes.rst
#	docs/quickstart.rst
#	docs/usage.rst
#	docs/usage/upgrade.rst.inc
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/crypto.pyx
#	src/borg/helpers.py
#	src/borg/key.py
#	src/borg/remote.py
#	src/borg/repository.py
#	src/borg/testsuite/archive.py
#	src/borg/testsuite/archiver.py
#	src/borg/testsuite/crypto.py
#	src/borg/testsuite/helpers.py
#	src/borg/testsuite/repository.py
#	src/borg/upgrader.py
#	tox.ini
2017-01-12 15:01:41 +01:00
Hartmut Goebel 0f7493299c Vagrantfile: Split cygwin packaged to be installed into base and project.
The packages which are required for ssh log-in and rsync synchronized
folders to work are separated from those specific for the borg
project. This makes it easier to reuse in other projects.
2017-01-08 22:16:54 +01:00
Thomas Waldmann c412b86455 vagrant: add Python 3.6.0 2017-01-04 01:06:57 +01:00
Thomas Waldmann c83a124e65 Merge branch '1.0-maint' (into master) 2016-11-28 02:23:32 +01:00
Thomas Waldmann 9643e64211 upgrade FUSE for macOS to 3.5.3 2016-11-27 02:09:19 +01:00
Thomas Waldmann 1dc51e6df8 Vagrantfile: reduce code duplication 2016-11-24 04:07:21 +01:00
Thomas Waldmann 6bb363c707 Vagrantfile: cosmetic: remove tabs / empty lines 2016-11-24 04:07:21 +01:00
Marian Beermann 05a52ec8ec
Merge branch '1.0-maint' into merge/1.0-maint 2016-11-09 23:56:54 +01:00
Thomas Waldmann 1b462cdbed vagrant: remove llfuse from tox.ini at a central place 2016-11-02 03:12:57 +01:00
TW e38e4160ef Merge pull request #1780 from ThomasWaldmann/fix-centos6-testing
vagrant: do not try to install llfuse on centos6
2016-11-02 01:31:58 +01:00
ololoru 5b0bff1962 add windows virtual machine
* Default memory size of Windows VM is 2048 mb
* Stop using mls-openssh and replace it with cygwin sshd by updating service start path in registry
2016-10-31 11:37:57 -05:00
Thomas Waldmann aa62a164d9 vagrant: do not try to install llfuse on centos6
it breaks everything...
2016-10-31 02:36:49 +01:00
Thomas Waldmann 09e74af7bf Merge branch '1.0-maint' 2016-10-24 21:41:20 +02:00
Thomas Waldmann 2b90e45dd1 vagrant: fix fuse permission issues on linux/freebsd, fixes #1544 2016-10-20 16:53:46 +02:00
Thomas Waldmann 57402b120b vagrant: no chown when rsyncing
it tries to do chown -R vagrant.vagrant, but some boxes do not
have a vagrant group and break there. also, we do our own chown
in the provisioning scripts.
2016-10-17 17:37:33 +02:00
Thomas Waldmann 63ff002b19 vagrant / netbsd: use own box, fixes #1671, fixes #1728
self-made basic netbsd box includes pre-installed rsync as vagrant is unable to install rsync.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on netbsd).
2016-10-17 02:03:52 +02:00
Thomas Waldmann 4ca0ed150b vagrant / openbsd: use own box, fixes #1695
self-made basic openbsd box includes pre-installed rsync as vagrant is unable to install rsync.
as the self-made box now has enough space on /, remove workaround for low space.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on openbsd).
2016-10-15 15:21:38 +02:00
Thomas Waldmann b0cc4fd74a Merge branch '1.0-maint' into merge-1.0-maint 2016-10-13 19:10:04 +02:00