File tree Expand file tree Collapse file tree 5 files changed +57
-4
lines changed Expand file tree Collapse file tree 5 files changed +57
-4
lines changed Original file line number Diff line number Diff line change 9
9
- [ ] I have split my patch into logically separate commits.
10
10
- [ ] All commit messages clearly explain what they change and why.
11
11
- [ ] PR description sums up the changes and reasons why they should be introduced.
12
- - [ ] I have enabled appropriate tests in ` .github/workflows/build.yaml ` in ` gtest_filter ` .
12
+ - [ ] I have enabled appropriate tests in ` .github/workflows/build.yml ` in ` gtest_filter ` .
13
+ - [ ] I have enabled appropriate tests in ` .github/workflows/cassandra.yml ` in ` gtest_filter ` .
Original file line number Diff line number Diff line change 43
43
:*5.Integration_Cassandra_*\
44
44
:*19.Integration_Cassandra_*\
45
45
:CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_UDT"
46
- run : valgrind --error-exitcode=123 ./cassandra-integration-tests --version=release:5.0.0 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"
46
+ run : valgrind --error-exitcode=123 ./cassandra-integration-tests --scylla -- version=release:5.0.0 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"
Original file line number Diff line number Diff line change
1
+ name : Cassandra
2
+
3
+ on :
4
+ push :
5
+ branches : [ master ]
6
+ pull_request :
7
+ branches : [ master ]
8
+
9
+ env :
10
+ CARGO_TERM_COLOR : always
11
+
12
+ jobs :
13
+ build :
14
+ runs-on : ubuntu-latest
15
+ steps :
16
+ - uses : actions/checkout@v2
17
+
18
+ - name : Set up JDK 8
19
+ uses : actions/setup-java@v2
20
+ with :
21
+ java-version : ' 8'
22
+ distribution : ' adopt'
23
+
24
+ - name : Setup Python 3
25
+ uses : actions/setup-python@v2
26
+ with :
27
+ python-version : ' 3.x'
28
+
29
+ - name : Setup environment
30
+ run : |
31
+ sudo sh -c "echo 'deb http://security.ubuntu.com/ubuntu xenial-security main' >> /etc/apt/sources.list"
32
+ sudo apt-get update
33
+ sudo apt-get install libssl1.0.0 libuv1-dev libkrb5-dev libc6-dbg
34
+ sudo snap install valgrind --classic
35
+ pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
36
+ sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
37
+
38
+ - name : Build
39
+ run : cmake -DCASS_BUILD_INTEGRATION_TESTS=ON . && make
40
+
41
+ - name : Run integration tests on Cassandra 3.0.8
42
+ env :
43
+ # Ignored tests are added in the end, after the "-" sign.
44
+ Tests : " ClusterTests.*\
45
+ :BasicsTests.*\
46
+ :PreparedTests.*\
47
+ :CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_*\
48
+ :-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
49
+ :*5.Integration_Cassandra_*\
50
+ :*19.Integration_Cassandra_*\
51
+ :CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_UDT"
52
+ run : valgrind --error-exitcode=123 ./cassandra-integration-tests --version=3.0.8 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ typedef struct _LIBSSH2_CHANNEL LIBSSH2_CHANNEL;
53
53
#define DEFAULT_REMOTE_DEPLOYMENT_USERNAME " vagrant"
54
54
#define DEFAULT_REMOTE_DEPLOYMENT_PASSWORD " vagrant"
55
55
#define DEFAULT_IS_VERBOSE false
56
- #define DEFAULT_IS_SCYLLA true
56
+ #define DEFAULT_IS_SCYLLA false
57
57
#define DEFAULT_SMP 1
58
58
#define DEFAULT_JVM_ARGUMENTS std::vector<std::string>()
59
59
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ std::string Options::private_key_ = "private.key";
50
50
bool Options::is_verbose_ccm_ = false ;
51
51
bool Options::is_verbose_integration_ = false ;
52
52
bool Options::is_beta_protocol_ = true ;
53
- bool Options::is_scylla_ = true ;
53
+ bool Options::is_scylla_ = false ;
54
54
int Options::smp_ = 1 ;
55
55
56
56
// Static initialization is not guaranteed for the following types
You can’t perform that action at this time.
0 commit comments