1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-29 11:16:43 +00:00
Commit graph

127 commits

Author SHA1 Message Date
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