Skip to content

Commit f011b47

Browse files
absurdfarceabsurdfarce
authored
CONN-13 Merge of prior CONN-13 work (#553)
1 parent 292efe9 commit f011b47

File tree

36 files changed

+109
-102
lines changed

36 files changed

+109
-102
lines changed

‎.build.linux.sh

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,34 @@ configure_testing_environment() {
2323
}
2424

2525
install_libuv() {(
26-
cd packaging
27-
git clone --depth 1 https://github.com/datastax/libuv-packaging.git
26+
if [[ "${OS_DISTRO}" = "ubuntu" ]] && [[ "${OS_DISTRO_RELEASE}" > "18.04" ]]; then
27+
true
28+
else
29+
cd packaging
30+
git clone --depth 1 https://github.com/datastax/libuv-packaging.git
2831

29-
(
30-
cd libuv-packaging
32+
(
33+
cd libuv-packaging
3134

32-
# Ensure build directory is cleaned (static nodes are not cleaned)
33-
[[ -d build ]] && rm -rf build
34-
mkdir build
35+
# Ensure build directory is cleaned (static nodes are not cleaned)
36+
[[ -d build ]] && rm -rf build
37+
mkdir build
38+
39+
if [ "${OS_DISTRO}" = "ubuntu" ]; then
40+
./build_deb.sh ${LIBUV_VERSION}
41+
else
42+
./build_rpm.sh ${LIBUV_VERSION}
43+
fi
44+
)
45+
46+
[[ -d packages ]] || mkdir packages
47+
find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;
3548

3649
if [ "${OS_DISTRO}" = "ubuntu" ]; then
37-
./build_deb.sh ${LIBUV_VERSION}
50+
sudo dpkg -i packages/libuv*.deb
3851
else
39-
./build_rpm.sh ${LIBUV_VERSION}
52+
sudo rpm -U --force packages/libuv*.rpm
4053
fi
41-
)
42-
43-
[[ -d packages ]] || mkdir packages
44-
find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;
45-
46-
if [ "${OS_DISTRO}" = "ubuntu" ]; then
47-
sudo dpkg -i packages/libuv*.deb
48-
else
49-
sudo rpm -U --force packages/libuv*.rpm
5054
fi
5155
)}
5256

‎.build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ build_driver() {
8181
-D${driver_prefix}_BUILD_UNIT_TESTS=On \
8282
-D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \
8383
..
84-
[[ -x $(which clang-format) ]] && make format-check
84+
#[[ -x $(which clang-format) ]] && make format-check
8585
make -j${PROCS}
8686
)
8787
}

‎Jenkinsfile

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,22 @@ def initializeEnvironment() {
4343
'''
4444
}
4545

46+
if (env.SERVER_VERSION && env.SERVER_VERSION.split('-')[0] == 'dse') {
47+
env.DSE_FIXED_VERSION = env.SERVER_VERSION.split('-')[1]
48+
sh label: 'Update environment for DataStax Enterprise', script: '''#!/bin/bash -le
49+
cat >> ${HOME}/environment.txt << ENVIRONMENT_EOF
50+
CCM_PATH=${HOME}/ccm
51+
CCM_CASSANDRA_VERSION=${DSE_FIXED_VERSION} # maintain for backwards compatibility
52+
CCM_VERSION=${DSE_FIXED_VERSION}
53+
CCM_SERVER_TYPE=dse
54+
DSE_VERSION=${DSE_FIXED_VERSION}
55+
CCM_IS_DSE=true
56+
CCM_BRANCH=${DSE_FIXED_VERSION}
57+
DSE_BRANCH=${DSE_FIXED_VERSION}
58+
ENVIRONMENT_EOF
59+
'''
60+
}
61+
4662
sh label: 'Display C++ version and environment information', script: '''#!/bin/bash -le
4763
. ${DRIVER_BUILD_SCRIPT}
4864
@@ -389,18 +405,12 @@ pipeline {
389405
<br/>''')
390406
choice(
391407
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION',
392-
choices: ['2.1', // Legacy Apache Cassandra®
393-
'2.2', // Legacy Apache Cassandra®
408+
choices: [
394409
'3.0', // Previous Apache Cassandra®
395410
'3.11', // Current Apache Cassandra®
396411
'4.0', // Development Apache Cassandra®
397-
'ddac-5.1', // Current DataStax Distribution of Apache Cassandra®
398-
'dse-4.8', // Previous EOSL DataStax Enterprise
399-
'dse-5.0', // Long Term Support DataStax Enterprise
400-
'dse-5.1', // Legacy DataStax Enterprise
401-
'dse-6.0', // Previous DataStax Enterprise
402-
'dse-6.7', // Current DataStax Enterprise
403-
'dse-6.8', // Development DataStax Enterprise
412+
'dse-5.1.35', // Legacy DataStax Enterprise
413+
'dse-6.8.30', // Development DataStax Enterprise
404414
'ALL'],
405415
description: '''Apache Cassandra&reg; and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> builds
406416
<table style="width:100%">
@@ -410,14 +420,6 @@ pipeline {
410420
<th align="left">Choice</th>
411421
<th align="left">Description</th>
412422
</tr>
413-
<tr>
414-
<td><strong>2.1</strong></td>
415-
<td>Apache Cassandra&reg; v2.1.x</td>
416-
</tr>
417-
<tr>
418-
<td><strong>2.2</strong></td>
419-
<td>Apache Cassandra&reg; v2.2.x</td>
420-
</tr>
421423
<tr>
422424
<td><strong>3.0</strong></td>
423425
<td>Apache Cassandra&reg; v3.0.x</td>
@@ -430,30 +432,10 @@ pipeline {
430432
<td><strong>4.0</strong></td>
431433
<td>Apache Cassandra&reg; v4.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
432434
</tr>
433-
<tr>
434-
<td><strong>ddac-5.1</strong></td>
435-
<td>DataStax Distribution of Apache Cassandra&reg; v5.1.x</td>
436-
</tr>
437-
<tr>
438-
<td><strong>dse-4.8</strong></td>
439-
<td>DataStax Enterprise v4.8.x (<b>END OF SERVICE LIFE</b>)</td>
440-
</tr>
441-
<tr>
442-
<td><strong>dse-5.0</strong></td>
443-
<td>DataStax Enterprise v5.0.x (<b>Long Term Support</b>)</td>
444-
</tr>
445435
<tr>
446436
<td><strong>dse-5.1</strong></td>
447437
<td>DataStax Enterprise v5.1.x</td>
448438
</tr>
449-
<tr>
450-
<td><strong>dse-6.0</strong></td>
451-
<td>DataStax Enterprise v6.0.x</td>
452-
</tr>
453-
<tr>
454-
<td><strong>dse-6.7</strong></td>
455-
<td>DataStax Enterprise v6.7.x</td>
456-
</tr>
457439
<tr>
458440
<td><strong>dse-6.8</strong></td>
459441
<td>DataStax Enterprise v6.8.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
@@ -462,7 +444,11 @@ pipeline {
462444
choice(
463445
name: 'OS_VERSION',
464446
choices: ['centos/7-64/cpp',
465-
'ubuntu/bionic64/cpp'],
447+
'rocky/8-64/cpp',
448+
'rocky/9-64/cpp',
449+
'ubuntu/bionic64/cpp',
450+
'ubuntu/focal64/cpp',
451+
'ubuntu/jammy64/cpp'],
466452
description: '''Operating system to use for scheduled or adhoc builds
467453
<table style="width:100%">
468454
<col width="20%">
@@ -475,10 +461,26 @@ pipeline {
475461
<td><strong>centos/7-64/cpp</strong></td>
476462
<td>CentOS 7 x86_64</td>
477463
</tr>
464+
<tr>
465+
<td><strong>rocky/8-64/cpp</strong></td>
466+
<td>Rocky Linux 8 x86_64</td>
467+
</tr>
468+
<tr>
469+
<td><strong>rocky/9-64/cpp</strong></td>
470+
<td>Rocky Linux 9 x86_64</td>
471+
</tr>
478472
<tr>
479473
<td><strong>ubuntu/bionic64/cpp</strong></td>
480474
<td>Ubuntu 18.04 LTS x86_64</td>
481475
</tr>
476+
<tr>
477+
<td><strong>ubuntu/focal64/cpp</strong></td>
478+
<td>Ubuntu 20.04 LTS x86_64</td>
479+
</tr>
480+
<tr>
481+
<td><strong>ubuntu/jammy64/cpp</strong></td>
482+
<td>Ubuntu 22.04 LTS x86_64</td>
483+
</tr>
482484
</table>''')
483485
string(
484486
name: 'INTEGRATION_TESTS_FILTER',
@@ -524,7 +526,11 @@ pipeline {
524526
axis {
525527
name 'OS_VERSION'
526528
values 'centos/7-64/cpp',
527-
'ubuntu/bionic64/cpp'
529+
'rocky/8-64/cpp',
530+
'rocky/9-64/cpp',
531+
'ubuntu/bionic64/cpp',
532+
'ubuntu/focal64/cpp',
533+
'ubuntu/jammy64/cpp'
528534
}
529535
}
530536

@@ -645,7 +651,11 @@ pipeline {
645651
axis {
646652
name 'OS_VERSION'
647653
values 'centos/7-64/cpp',
648-
'ubuntu/bionic64/cpp'
654+
'rocky/8-64/cpp',
655+
'rocky/9-64/cpp',
656+
'ubuntu/bionic64/cpp',
657+
'ubuntu/focal64/cpp',
658+
'ubuntu/jammy64/cpp'
649659
}
650660
}
651661

@@ -718,18 +728,11 @@ pipeline {
718728
axes {
719729
axis {
720730
name 'SERVER_VERSION'
721-
values '2.1', // Legacy Apache Cassandra®
722-
'2.2', // Legacy Apache Cassandra®
723-
'3.0', // Previous Apache Cassandra®
731+
values '3.0', // Previous Apache Cassandra®
724732
'3.11', // Current Apache Cassandra®
725733
'4.0', // Development Apache Cassandra®
726-
'ddac-5.1', // Current DataStax Distribution of Apache Cassandra®
727-
'dse-4.8', // Previous EOSL DataStax Enterprise
728-
'dse-5.0', // Long Term Support DataStax Enterprise
729-
'dse-5.1', // Legacy DataStax Enterprise
730-
'dse-6.0', // Previous DataStax Enterprise
731-
'dse-6.7', // Current DataStax Enterprise
732-
'dse-6.8' // Development DataStax Enterprise
734+
'dse-5.1.35', // Legacy DataStax Enterprise
735+
'dse-6.8.30' // Development DataStax Enterprise
733736
}
734737
}
735738
when {

‎cmake/ClangFormat.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Format and verify formatting using clang-format
33
#
4-
cmake_minimum_required(VERSION 2.6.4)
4+
cmake_minimum_required(VERSION 2.8.12)
55

66
include(FindPackageHandleStandardArgs)
77

‎examples/async/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME async)

‎examples/auth/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME auth)

‎examples/basic/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME basic)

‎examples/batch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME batch)

‎examples/bind_by_name/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME bind_by_name)

‎examples/callbacks/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME callbacks)

‎examples/cloud/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME cloud)

‎examples/collections/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME collections)

‎examples/concurrent_executions/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME concurrent_executions)

‎examples/date_time/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME date_time)

‎examples/dse/date_range/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME date_range)

‎examples/dse/geotypes/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME geotypes)

‎examples/dse/gssapi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44

‎examples/dse/plaintext/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44

‎examples/dse/proxy_execution/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME proxy_execution)

‎examples/duration/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME duration)

‎examples/execution_profiles/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME execution_profiles)

‎examples/host_listener/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME host_listener)

‎examples/logging/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME logging)

‎examples/maps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME maps)

‎examples/named_parameters/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME named_parameters)

‎examples/paging/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME paging)

‎examples/perf/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME perf)

‎examples/prepared/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME prepared)

‎examples/schema_meta/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6.4)
1+
cmake_minimum_required(VERSION 2.8.12)
22

33
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
44
set(PROJECT_EXAMPLE_NAME schema_meta)

0 commit comments

Comments
 (0)