Skip to content

Commit b60929a

Browse files
authored
Merge pull request #74 from Gor027/cassandra_tests
Add workflow to Github actions to run tests on Cassandra
2 parents 58d4c7d + cede1a6 commit b60929a

File tree

5 files changed

+57
-4
lines changed

5 files changed

+57
-4
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
- [ ] I have split my patch into logically separate commits.
1010
- [ ] All commit messages clearly explain what they change and why.
1111
- [ ] 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`.

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
:*5.Integration_Cassandra_*\
4545
:*19.Integration_Cassandra_*\
4646
:CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_UDT"
47-
run: valgrind --error-exitcode=123 ./cassandra-integration-tests --version=release:5.0.0 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"
47+
run: valgrind --error-exitcode=123 ./cassandra-integration-tests --scylla --version=release:5.0.0 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"

.github/workflows/cassandra.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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"

tests/src/integration/ccm/bridge.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ typedef struct _LIBSSH2_CHANNEL LIBSSH2_CHANNEL;
5353
#define DEFAULT_REMOTE_DEPLOYMENT_USERNAME "vagrant"
5454
#define DEFAULT_REMOTE_DEPLOYMENT_PASSWORD "vagrant"
5555
#define DEFAULT_IS_VERBOSE false
56-
#define DEFAULT_IS_SCYLLA true
56+
#define DEFAULT_IS_SCYLLA false
5757
#define DEFAULT_SMP 1
5858
#define DEFAULT_JVM_ARGUMENTS std::vector<std::string>()
5959

tests/src/integration/options.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ std::string Options::private_key_ = "private.key";
5050
bool Options::is_verbose_ccm_ = false;
5151
bool Options::is_verbose_integration_ = false;
5252
bool Options::is_beta_protocol_ = true;
53-
bool Options::is_scylla_ = true;
53+
bool Options::is_scylla_ = false;
5454
int Options::smp_ = 1;
5555

5656
// Static initialization is not guaranteed for the following types

0 commit comments

Comments
 (0)