Commit Graph

253 Commits

Author SHA1 Message Date
sfc-gh-tclinkenbeard cf4c8e375f Merge remote-tracking branch 'origin/release-6.3' into merge 2020-10-29 22:15:41 -07:00
Meng Xu 8f432406f0
Merge pull request #3937 from sfc-gh-mpilman/features/Dockerfile.centos7
New CentoOS7 based image
2020-10-28 10:30:08 -07:00
Steve Atherton 99c1880a83 Merge commit 'f9581de2005e6b085776e81b9fcaa16442b32589' into merge-6.2-to-6.3
# Conflicts:
#	fdbserver/Knobs.cpp
#	fdbserver/Knobs.h
2020-10-27 12:21:26 -07:00
Andrew Noyes d0bc9c95df Update Dockerfile.devel version 2020-10-26 13:36:26 -07:00
Andrew Noyes e3ab9e93f6 Change version to 0.1.19 2020-10-26 13:33:44 -07:00
Andrew Noyes cd596dcfd5 Install asan in foundationdb-build docker image 2020-10-26 13:33:44 -07:00
Markus Pilman 6fa9acb567 renamed docker file 2020-10-26 11:34:06 -06:00
Markus Pilman 72839af1c0 install python36 with the first install 2020-10-26 09:51:30 -06:00
Russell Sears 92a5178b4a
Merge branch 'release-6.3' into release-6-2-2020-10-23 2020-10-23 12:24:48 -07:00
Andrew Noyes 6282a0eab4 Revert "Revert "Run all ctest tests""
This reverts commit 91720bf83c.
2020-10-21 22:45:46 +00:00
Andrew Noyes 91720bf83c
Revert "Run all ctest tests" 2020-10-21 15:09:55 -07:00
Markus Pilman 66ea0de76a added toml 2020-10-21 14:43:41 -06:00
Markus Pilman 6d25f27a40 install ccache and python36
it seems that now FDB can be built with this image
2020-10-21 13:56:59 -06:00
Meng Xu 8dfcacf88d
Merge pull request #3886 from sfc-gh-anoyes/anoyes/try-to-run-all-ctest-tests
Run all ctest tests
2020-10-21 10:52:55 -07:00
Daniel Smith c7345b8ab5 Fix static linking of lz4
Conflicts:
	fdbserver/CMakeLists.txt
2020-10-21 10:26:55 -07:00
Daniel Smith 433c5cba4e Install the static lz4 library as well 2020-10-21 10:24:56 -07:00
Daniel Smith fd607c5236 Update with newest docker container version
Conflicts:
	build/docker-compose.yaml
2020-10-21 10:24:44 -07:00
Daniel Smith 1c2dafee6b Bump Dockerfile versions
Conflicts:
	build/Dockerfile
	build/Dockerfile.devel
2020-10-21 10:23:45 -07:00
Markus Pilman 01a1598e8f New CentoOS7 based image 2020-10-21 11:23:05 -06:00
Young Liu 8cc3e4d3c6 Merge release-6.3 into master 2020-10-19 22:51:56 -07:00
Daniel Smith 1b82adde3a Use lz4
Conflicts:
	cmake/CompileRocksDB.cmake
	fdbserver/CMakeLists.txt
2020-10-19 13:33:43 -07:00
Jingyu Zhou 8f17a1a5d6 Merge branch 'release-6.2' into release-6.3 2020-10-16 15:25:39 -07:00
Andrew Noyes a7aed056a4 Try to run all ctest tests 2020-10-09 22:32:55 +00:00
Alvin Moore 5f1312f861
Merge pull request #3792 from sfc-gh-tclinkenbeard/add-jq-to-dockerdevel
Install jq in development Docker image
2020-10-08 08:25:36 -04:00
Markus Pilman 268ba0bddc Merge remote-tracking branch 'origin/release-6.3' into merge-6.3 2020-10-01 14:14:06 -06:00
sfc-gh-tclinkenbeard c50931832c Update base version in Dockerfile.devel 2020-09-30 10:45:25 -07:00
Evan Tschannen 2d788b309f Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	documentation/sphinx/source/api-error-codes.rst
#	flow/ThreadHelper.actor.h
#	flow/error_definitions.h
2020-09-24 17:16:58 -07:00
Alvin Moore 9d130bdecf Updated OpenSsl version from 1.1.1d to 1.1.1h 2020-09-24 19:23:56 -04:00
sfc-gh-tclinkenbeard fda996f68d Update devel docker image version to 0.11.9 2020-09-24 11:19:48 -07:00
sfc-gh-tclinkenbeard af76bfc1df Install jq in development Docker image
This helps with parsing JSON logs
2020-09-20 16:00:39 -07:00
Evan Tschannen 12edadd059 Merge branch 'release-6.3'
# Conflicts:
#	CMakeLists.txt
#	fdbclient/Knobs.cpp
#	fdbclient/MasterProxyInterface.h
#	fdbrpc/simulator.h
#	fdbserver/MasterProxyServer.actor.cpp
#	tests/fast/CycleAndLock.txt
#	tests/fast/TxnStateStoreCycleTest.txt
#	tests/fast/VersionStamp.txt
#	tests/slow/ParallelRestoreOldBackupApiCorrectnessAtomicRestore.txt
#	tests/slow/ParallelRestoreOldBackupCorrectnessCycle.txt
#	versions.target
2020-08-31 19:33:34 -07:00
Evan Tschannen 29eec30183 Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	CMakeLists.txt
#	build/Dockerfile
#	build/Dockerfile.devel
#	documentation/sphinx/source/downloads.rst
#	fdbserver/Knobs.cpp
#	fdbserver/LogSystem.h
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/TagPartitionedLogSystem.actor.cpp
#	fdbserver/WaitFailure.actor.cpp
#	fdbserver/fdbserver.vcxproj
#	fdbserver/fdbserver.vcxproj.filters
#	packaging/msi/FDBInstaller.wxs
2020-08-31 01:10:29 -07:00
Alvin Moore aa8bac49b2 Added cgdb package 2020-08-18 08:43:45 -04:00
Alvin Moore 4242008d06 Renamed the go binary such that it is not used by default 2020-07-31 02:18:57 -07:00
Alvin Moore 6a00836437 Installed RocksDB
Localized the time zone
2020-07-20 11:35:37 -07:00
Alex Miller f57659d27e Reformat with `black`, a pep8 autoreformatting tool. 2020-07-12 17:19:55 -07:00
Alex Miller 2841efe938 Rewrite most .txt tests into (pretty) .toml files.
This includes build/txt-to-toml.py which did the rewrites, and
can be used to rewrite other no-in-tree test spec files to toml.

I didn't touch status or restarting tests yet.  Restarting will be handled
later.  It turns out that I don't understand how status tests work.
2020-07-12 14:47:40 -07:00
A.J. Beamon 76ac5dfeaf Merge branch 'release-6.3' into merge-release-6.3-into-master
# Conflicts:
#	documentation/sphinx/source/release-notes/release-notes-630.rst
2020-06-17 18:31:06 -07:00
Daniel Smith 8c00b391da Merge remote-tracking branch 'upstream/release-6.3' into rocksdb-build 2020-06-10 21:29:20 +00:00
Steve Atherton 61fcce08cc
Merge pull request #3324 from apple/release-6.3
merge Release 6.3
2020-06-09 18:56:47 -07:00
Alvin Moore 64a4cf287e Added support for building test packages via docker compose 2020-06-08 11:17:27 -07:00
Daniel Smith c836a9f5a9 Add RocksDB to build Dockerfile and CMake to build RocksDB 2020-06-08 16:22:28 +00:00
Balachandar Namasivayam a167bf344e Update api version to 700 2020-05-28 12:16:03 -07:00
Alvin Moore 3f690def8c
Merge pull request #3170 from apple/release-6.2
Merge Release 6.2 into Release 6.3
2020-05-14 09:18:25 -07:00
Alvin Moore 123fe87ae5
Merge pull request #3159 from AlvinMooreSr/docker-update
Newer Git To Build Docker
2020-05-14 06:43:33 -07:00
Alvin Moore e10e09f9fa Removed the git installation since in inheritted docker image 2020-05-14 01:45:25 -07:00
Alvin Moore afec69101b Updated the version 2020-05-14 01:06:14 -07:00
Alvin Moore c85b302e59 Added Dockerfile used to build a development docker image 2020-05-14 01:06:14 -07:00
Alvin Moore 31c298c5de Integrated git repository with others 2020-05-12 23:02:51 -07:00
Alvin Moore c496f6e216 Updated dockerfile to include newer version of git 2020-05-12 10:43:34 -07:00