diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index db249da73..000000000 --- a/.travis.yml +++ /dev/null @@ -1,280 +0,0 @@ -dist: xenial -language: cpp -os: - - linux -arch: - - arm64 - - ppc64le - - s390x -compiler: - - clang - - gcc -cache: - - ccache - -addons: - apt: - update: true - sources: - - ubuntu-toolchain-r-test - packages: - - libgflags-dev - - libbz2-dev - - liblz4-dev - - libsnappy-dev - - liblzma-dev # xv - - libzstd-dev - - zlib1g-dev - -env: - - TEST_GROUP=platform_dependent # 16-18 minutes - - TEST_GROUP=1 # 33-35 minutes - - TEST_GROUP=2 # 18-20 minutes - - TEST_GROUP=3 # 20-22 minutes - - TEST_GROUP=4 # 12-14 minutes - # Run java tests - - JOB_NAME=java_test # 4-11 minutes - # Build ROCKSDB_LITE - - JOB_NAME=lite_build # 3-4 minutes - # Build examples - - JOB_NAME=examples # 5-7 minutes - - JOB_NAME=cmake # 3-5 minutes - - JOB_NAME=cmake-gcc8 # 3-5 minutes - - JOB_NAME=cmake-gcc9 # 3-5 minutes - - JOB_NAME=cmake-gcc9-c++20 # 3-5 minutes - - JOB_NAME=cmake-mingw # 3 minutes - -matrix: - exclude: - - os : linux - arch: arm64 - env: JOB_NAME=cmake-mingw - - os: linux - arch: ppc64le - env: JOB_NAME=cmake-mingw - - os: linux - arch: s390x - env: JOB_NAME=cmake-mingw - - os: linux - compiler: clang - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: arm64 - env: TEST_GROUP=platform_dependent - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: TEST_GROUP=1 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: TEST_GROUP=1 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: TEST_GROUP=1 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: TEST_GROUP=2 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: TEST_GROUP=2 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: TEST_GROUP=2 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: TEST_GROUP=3 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: TEST_GROUP=3 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: TEST_GROUP=3 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: TEST_GROUP=4 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: TEST_GROUP=4 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: TEST_GROUP=4 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: JOB_NAME=cmake - - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/ - os : linux - arch: arm64 - env: JOB_NAME=java_test - - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/ - os: linux - arch: ppc64le - env: JOB_NAME=java_test - - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/ - os: linux - arch: s390x - env: JOB_NAME=java_test - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: JOB_NAME=lite_build - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: JOB_NAME=lite_build - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: JOB_NAME=lite_build - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: JOB_NAME=examples - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: JOB_NAME=examples - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: JOB_NAME=examples - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: JOB_NAME=cmake-gcc8 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: JOB_NAME=cmake-gcc8 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: JOB_NAME=cmake-gcc8 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: JOB_NAME=cmake-gcc9 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: JOB_NAME=cmake-gcc9 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: JOB_NAME=cmake-gcc9 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: arm64 - env: JOB_NAME=cmake-gcc9-c++20 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: JOB_NAME=cmake-gcc9-c++20 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: s390x - env: JOB_NAME=cmake-gcc9-c++20 - -install: - - CC=gcc-7 && CXX=g++-7 - - if [ "${JOB_NAME}" == cmake-gcc8 ]; then - sudo apt-get install -y g++-8 || exit $?; - CC=gcc-8 && CXX=g++-8; - fi - - if [ "${JOB_NAME}" == cmake-gcc9 ] || [ "${JOB_NAME}" == cmake-gcc9-c++20 ]; then - sudo apt-get install -y g++-9 || exit $?; - CC=gcc-9 && CXX=g++-9; - fi - - if [ "${JOB_NAME}" == cmake-mingw ]; then - sudo apt-get install -y mingw-w64 || exit $?; - fi - - if [ "${CXX}" == "g++-7" ]; then - sudo apt-get install -y g++-7 || exit $?; - fi - - | - if [[ "${JOB_NAME}" == cmake* ]]; then - sudo apt-get remove -y cmake cmake-data - export CMAKE_DEB="cmake-3.14.5-Linux-$(uname -m).deb" - export CMAKE_DEB_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/${CMAKE_DEB}" - curl --silent --fail --show-error --location --output "${CMAKE_DEB}" "${CMAKE_DEB_URL}" || exit $? - sudo dpkg -i "${CMAKE_DEB}" || exit $? - which cmake && cmake --version - fi - - | - if [[ "${JOB_NAME}" == java_test || "${JOB_NAME}" == cmake* ]]; then - # Ensure JDK 8 - sudo apt-get install -y openjdk-8-jdk || exit $? - export PATH=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin:$PATH - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) - echo "JAVA_HOME=${JAVA_HOME}" - which java && java -version - which javac && javac -version - fi - -before_script: - # Increase the maximum number of open file descriptors, since some tests use - # more FDs than the default limit. - - ulimit -n 8192 - -script: - - date; ${CXX} --version - - if [ `command -v ccache` ]; then ccache -C; fi - - export MK_PARALLEL=4; - if [[ "$TRAVIS_CPU_ARCH" == s390x ]]; then - export MK_PARALLEL=1; - fi - - case $TEST_GROUP in - platform_dependent) - OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=only make -j$MK_PARALLEL all_but_some_tests check_some - ;; - 1) - OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_END=backup_engine_test make -j$MK_PARALLEL check_some - ;; - 2) - OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 make -j$MK_PARALLEL tools && OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=backup_engine_test ROCKSDBTESTS_END=db_universal_compaction_test make -j$MK_PARALLEL check_some - ;; - 3) - OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=db_universal_compaction_test ROCKSDBTESTS_END=table_properties_collector_test make -j$MK_PARALLEL check_some - ;; - 4) - OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=table_properties_collector_test make -j$MK_PARALLEL check_some - ;; - esac - - case $JOB_NAME in - java_test) - OPT=-DTRAVIS LIB_MODE=shared V=1 make rocksdbjava jtest - ;; - lite_build) - OPT='-DTRAVIS -DROCKSDB_LITE' LIB_MODE=shared V=1 make -j$MK_PARALLEL all - ;; - examples) - OPT=-DTRAVIS LIB_MODE=shared V=1 make -j$MK_PARALLEL static_lib && cd examples && make -j$MK_PARALLEL - ;; - cmake-mingw) - sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; - mkdir build && cd build && cmake -DJNI=1 -DWITH_GFLAGS=OFF .. -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_SYSTEM_NAME=Windows && make -j4 rocksdb rocksdbjni - ;; - cmake*) - case $JOB_NAME in - *-c++20) - OPT=-DCMAKE_CXX_STANDARD=20 - ;; - esac - - mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=0 -DWITH_GFLAGS=0 -DWITH_BENCHMARK_TOOLS=0 -DWITH_TOOLS=0 -DWITH_CORE_TOOLS=1 .. && make -j$MK_PARALLEL && cd .. && rm -rf build && mkdir build && cd build && cmake -DJNI=1 .. -DCMAKE_BUILD_TYPE=Release $OPT && make -j$MK_PARALLEL rocksdb rocksdbjni - ;; - esac -notifications: - email: - - leveldb@fb.com diff --git a/README.md b/README.md index 22ad6d838..25989d346 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ ## RocksDB: A Persistent Key-Value Store for Flash and RAM Storage [![CircleCI Status](https://circleci.com/gh/facebook/rocksdb.svg?style=svg)](https://circleci.com/gh/facebook/rocksdb) -[![TravisCI Status](https://api.travis-ci.com/facebook/rocksdb.svg?branch=main)](https://travis-ci.com/github/facebook/rocksdb) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/fbgfu0so3afcno78/branch/main?svg=true)](https://ci.appveyor.com/project/Facebook/rocksdb/branch/main) [![PPC64le Build Status](http://140-211-168-68-openstack.osuosl.org:8080/buildStatus/icon?job=rocksdb&style=plastic)](http://140-211-168-68-openstack.osuosl.org:8080/job/rocksdb) diff --git a/build_tools/format-diff.sh b/build_tools/format-diff.sh index 3c16b08eb..62e8834f7 100755 --- a/build_tools/format-diff.sh +++ b/build_tools/format-diff.sh @@ -170,11 +170,6 @@ echo "$diffs" | sed -e "s/\(^-.*$\)/`echo -e \"$COLOR_RED\1$COLOR_END\"`/" | sed -e "s/\(^+.*$\)/`echo -e \"$COLOR_GREEN\1$COLOR_END\"`/" -if [[ "$OPT" == *"-DTRAVIS"* ]] -then - exit 1 -fi - echo -e "Would you like to fix the format automatically (y/n): \c" # Make sure under any mode, we can read user input. diff --git a/db/db_test.cc b/db/db_test.cc index df0f9ab8c..664dcad46 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -2773,7 +2773,7 @@ INSTANTIATE_TEST_CASE_P( #endif // ROCKSDB_LITE // Group commit test: -#if !defined(TRAVIS) && !defined(OS_WIN) +#if !defined(OS_WIN) // Disable this test temporarily on Travis and appveyor as it fails // intermittently. Github issue: #4151 namespace { @@ -2850,7 +2850,7 @@ TEST_F(DBTest, GroupCommitTest) { ASSERT_GT(hist_data.average, 0.0); } while (ChangeOptions(kSkipNoSeekToLast)); } -#endif // TRAVIS +#endif // OS_WIN namespace { using KVMap = std::map; diff --git a/env/env_test.cc b/env/env_test.cc index 4945dbf53..4c562620e 100644 --- a/env/env_test.cc +++ b/env/env_test.cc @@ -969,10 +969,6 @@ TEST_P(EnvPosixTestWithParam, ReserveThreads) { } #if (defined OS_LINUX || defined OS_WIN) -// Travis doesn't support fallocate or getting unique ID from files for whatever -// reason. -#ifndef TRAVIS - namespace { bool IsSingleVarint(const std::string& s) { Slice slice(s); @@ -1780,7 +1776,6 @@ TEST_P(EnvPosixTestWithParam, InvalidateCache) { ASSERT_OK(env_->DeleteFile(fname)); ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearTrace(); } -#endif // not TRAVIS #endif // OS_LINUX || OS_WIN class TestLogger : public Logger { diff --git a/env/io_posix.cc b/env/io_posix.cc index 0ea30803c..d29aa3a4c 100644 --- a/env/io_posix.cc +++ b/env/io_posix.cc @@ -1354,8 +1354,7 @@ IOStatus PosixWritableFile::Close(const IOOptions& /*opts*/, // but it will be nice to log these errors. int dummy __attribute__((__unused__)); dummy = ftruncate(fd_, filesize_); -#if defined(ROCKSDB_FALLOCATE_PRESENT) && defined(FALLOC_FL_PUNCH_HOLE) && \ - !defined(TRAVIS) +#if defined(ROCKSDB_FALLOCATE_PRESENT) && defined(FALLOC_FL_PUNCH_HOLE) // in some file systems, ftruncate only trims trailing space if the // new file size is smaller than the current size. Calling fallocate // with FALLOC_FL_PUNCH_HOLE flag to explicitly release these unused @@ -1367,11 +1366,6 @@ IOStatus PosixWritableFile::Close(const IOOptions& /*opts*/, // tmpfs (since Linux 3.5) // We ignore error since failure of this operation does not affect // correctness. - // TRAVIS - this code does not work on TRAVIS filesystems. - // the FALLOC_FL_KEEP_SIZE option is expected to not change the size - // of the file, but it does. Simple strace report will show that. - // While we work with Travis-CI team to figure out if this is a - // quirk of Docker/AUFS, we will comment this out. struct stat file_stats; int result = fstat(fd_, &file_stats); // After ftruncate, we check whether ftruncate has the correct behavior. diff --git a/util/rate_limiter_test.cc b/util/rate_limiter_test.cc index 0721c1b69..5e97c6614 100644 --- a/util/rate_limiter_test.cc +++ b/util/rate_limiter_test.cc @@ -346,7 +346,7 @@ TEST_F(RateLimiterTest, Rate) { // This can fail in heavily loaded CI environments bool skip_minimum_rate_check = -#if (defined(TRAVIS) || defined(CIRCLECI)) && defined(OS_MACOSX) +#if defined(CIRCLECI) && defined(OS_MACOSX) true; #else getenv("SANDCASTLE"); diff --git a/utilities/transactions/write_prepared_transaction_test.cc b/utilities/transactions/write_prepared_transaction_test.cc index 3a8de5115..71682c0e2 100644 --- a/utilities/transactions/write_prepared_transaction_test.cc +++ b/utilities/transactions/write_prepared_transaction_test.cc @@ -1166,8 +1166,6 @@ TEST_P(WritePreparedTransactionTest, CheckAgainstSnapshots) { } } -// This test is too slow for travis -#ifndef TRAVIS #if !defined(ROCKSDB_VALGRIND_RUN) || defined(ROCKSDB_FULL_VALGRIND_RUN) // Test that CheckAgainstSnapshots will not miss a live snapshot if it is run in // parallel with UpdateSnapshots. @@ -1249,7 +1247,6 @@ TEST_P(SnapshotConcurrentAccessTest, SnapshotConcurrentAccess) { printf("\n"); } #endif // !defined(ROCKSDB_VALGRIND_RUN) || defined(ROCKSDB_FULL_VALGRIND_RUN) -#endif // TRAVIS // This test clarifies the contract of AdvanceMaxEvictedSeq method TEST_P(WritePreparedTransactionTest, AdvanceMaxEvictedSeqBasic) {