Skip to content

CONN-13 Merge branch #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 31, 2023
Merged

CONN-13 Merge branch #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32ecfff
add centos 9 to the build target
weideng1 May 19, 2023
c0bbe26
fix cmake deprecation warning
weideng1 May 19, 2023
e6835ae
replaced centos 9 with rocky 9
weideng1 May 20, 2023
611cf8c
add rocky 8 to the matrix
weideng1 May 20, 2023
4e6e347
added Ubuntu focal and jammy to the build targets
weideng1 May 21, 2023
a822a0c
temp test avoiding libuv install for focal and jammy
weideng1 May 21, 2023
d608004
fixed a typo
weideng1 May 21, 2023
1fb8eea
fixed another typo
weideng1 May 21, 2023
9ceb02a
prune out C* and DSE versions that we no longer support
Jul 27, 2023
f8afb39
disable clang-format check
Jul 28, 2023
d65a19d
temporary workaround for borked ccm_environment.sh
Jul 27, 2023
c1307ac
Attempt at a quick Jenkinsfile fix
absurdfarce Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions .build.linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,34 @@ configure_testing_environment() {
}

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

(
cd libuv-packaging
(
cd libuv-packaging

# Ensure build directory is cleaned (static nodes are not cleaned)
[[ -d build ]] && rm -rf build
mkdir build
# Ensure build directory is cleaned (static nodes are not cleaned)
[[ -d build ]] && rm -rf build
mkdir build

if [ "${OS_DISTRO}" = "ubuntu" ]; then
./build_deb.sh ${LIBUV_VERSION}
else
./build_rpm.sh ${LIBUV_VERSION}
fi
)

[[ -d packages ]] || mkdir packages
find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;

if [ "${OS_DISTRO}" = "ubuntu" ]; then
./build_deb.sh ${LIBUV_VERSION}
sudo dpkg -i packages/libuv*.deb
else
./build_rpm.sh ${LIBUV_VERSION}
sudo rpm -U --force packages/libuv*.rpm
fi
)

[[ -d packages ]] || mkdir packages
find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;

if [ "${OS_DISTRO}" = "ubuntu" ]; then
sudo dpkg -i packages/libuv*.deb
else
sudo rpm -U --force packages/libuv*.rpm
fi
)}

Expand Down
2 changes: 1 addition & 1 deletion .build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ build_driver() {
-D${driver_prefix}_BUILD_UNIT_TESTS=On \
-D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \
..
[[ -x $(which clang-format) ]] && make format-check
#[[ -x $(which clang-format) ]] && make format-check
make -j${PROCS}
)
}
Expand Down
103 changes: 53 additions & 50 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@ def initializeEnvironment() {
'''
}

if (env.SERVER_VERSION && env.SERVER_VERSION.split('-')[0] == 'dse') {
env.DSE_FIXED_VERSION = env.SERVER_VERSION.split('-')[1]
sh label: 'Update environment for DataStax Enterprise', script: '''#!/bin/bash -le
cat >> ${HOME}/environment.txt << ENVIRONMENT_EOF
CCM_PATH=${HOME}/ccm
CCM_CASSANDRA_VERSION=${DSE_FIXED_VERSION} # maintain for backwards compatibility
CCM_VERSION=${DSE_FIXED_VERSION}
CCM_SERVER_TYPE=dse
DSE_VERSION=${DSE_FIXED_VERSION}
CCM_IS_DSE=true
CCM_BRANCH=${DSE_FIXED_VERSION}
DSE_BRANCH=${DSE_FIXED_VERSION}
ENVIRONMENT_EOF
'''
}

sh label: 'Display C++ version and environment information', script: '''#!/bin/bash -le
. ${DRIVER_BUILD_SCRIPT}

Expand Down Expand Up @@ -389,18 +405,12 @@ pipeline {
<br/>''')
choice(
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION',
choices: ['2.1', // Legacy Apache Cassandra�
'2.2', // Legacy Apache Cassandra�
choices: [
'3.0', // Previous Apache Cassandra�
'3.11', // Current Apache Cassandra�
'4.0', // Development Apache Cassandra�
'ddac-5.1', // Current DataStax Distribution of Apache Cassandra�
'dse-4.8', // Previous EOSL DataStax Enterprise
'dse-5.0', // Long Term Support DataStax Enterprise
'dse-5.1', // Legacy DataStax Enterprise
'dse-6.0', // Previous DataStax Enterprise
'dse-6.7', // Current DataStax Enterprise
'dse-6.8', // Development DataStax Enterprise
'dse-5.1.35', // Legacy DataStax Enterprise
'dse-6.8.30', // Development DataStax Enterprise
'ALL'],
description: '''Apache Cassandra&reg; and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> builds
<table style="width:100%">
Expand All @@ -410,14 +420,6 @@ pipeline {
<th align="left">Choice</th>
<th align="left">Description</th>
</tr>
<tr>
<td><strong>2.1</strong></td>
<td>Apache Cassandra&reg; v2.1.x</td>
</tr>
<tr>
<td><strong>2.2</strong></td>
<td>Apache Cassandra&reg; v2.2.x</td>
</tr>
<tr>
<td><strong>3.0</strong></td>
<td>Apache Cassandra&reg; v3.0.x</td>
Expand All @@ -430,30 +432,10 @@ pipeline {
<td><strong>4.0</strong></td>
<td>Apache Cassandra&reg; v4.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
</tr>
<tr>
<td><strong>ddac-5.1</strong></td>
<td>DataStax Distribution of Apache Cassandra&reg; v5.1.x</td>
</tr>
<tr>
<td><strong>dse-4.8</strong></td>
<td>DataStax Enterprise v4.8.x (<b>END OF SERVICE LIFE</b>)</td>
</tr>
<tr>
<td><strong>dse-5.0</strong></td>
<td>DataStax Enterprise v5.0.x (<b>Long Term Support</b>)</td>
</tr>
<tr>
<td><strong>dse-5.1</strong></td>
<td>DataStax Enterprise v5.1.x</td>
</tr>
<tr>
<td><strong>dse-6.0</strong></td>
<td>DataStax Enterprise v6.0.x</td>
</tr>
<tr>
<td><strong>dse-6.7</strong></td>
<td>DataStax Enterprise v6.7.x</td>
</tr>
<tr>
<td><strong>dse-6.8</strong></td>
<td>DataStax Enterprise v6.8.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
Expand All @@ -462,7 +444,11 @@ pipeline {
choice(
name: 'OS_VERSION',
choices: ['centos/7-64/cpp',
'ubuntu/bionic64/cpp'],
'rocky/8-64/cpp',
'rocky/9-64/cpp',
'ubuntu/bionic64/cpp',
'ubuntu/focal64/cpp',
'ubuntu/jammy64/cpp'],
description: '''Operating system to use for scheduled or adhoc builds
<table style="width:100%">
<col width="20%">
Expand All @@ -475,10 +461,26 @@ pipeline {
<td><strong>centos/7-64/cpp</strong></td>
<td>CentOS 7 x86_64</td>
</tr>
<tr>
<td><strong>rocky/8-64/cpp</strong></td>
<td>Rocky Linux 8 x86_64</td>
</tr>
<tr>
<td><strong>rocky/9-64/cpp</strong></td>
<td>Rocky Linux 9 x86_64</td>
</tr>
<tr>
<td><strong>ubuntu/bionic64/cpp</strong></td>
<td>Ubuntu 18.04 LTS x86_64</td>
</tr>
<tr>
<td><strong>ubuntu/focal64/cpp</strong></td>
<td>Ubuntu 20.04 LTS x86_64</td>
</tr>
<tr>
<td><strong>ubuntu/jammy64/cpp</strong></td>
<td>Ubuntu 22.04 LTS x86_64</td>
</tr>
</table>''')
string(
name: 'INTEGRATION_TESTS_FILTER',
Expand Down Expand Up @@ -524,7 +526,11 @@ pipeline {
axis {
name 'OS_VERSION'
values 'centos/7-64/cpp',
'ubuntu/bionic64/cpp'
'rocky/8-64/cpp',
'rocky/9-64/cpp',
'ubuntu/bionic64/cpp',
'ubuntu/focal64/cpp',
'ubuntu/jammy64/cpp'
}
}

Expand Down Expand Up @@ -645,7 +651,11 @@ pipeline {
axis {
name 'OS_VERSION'
values 'centos/7-64/cpp',
'ubuntu/bionic64/cpp'
'rocky/8-64/cpp',
'rocky/9-64/cpp',
'ubuntu/bionic64/cpp',
'ubuntu/focal64/cpp',
'ubuntu/jammy64/cpp'
}
}

Expand Down Expand Up @@ -718,18 +728,11 @@ pipeline {
axes {
axis {
name 'SERVER_VERSION'
values '2.1', // Legacy Apache Cassandra�
'2.2', // Legacy Apache Cassandra�
'3.0', // Previous Apache Cassandra�
values '3.0', // Previous Apache Cassandra�
'3.11', // Current Apache Cassandra�
'4.0', // Development Apache Cassandra�
'ddac-5.1', // Current DataStax Distribution of Apache Cassandra�
'dse-4.8', // Previous EOSL DataStax Enterprise
'dse-5.0', // Long Term Support DataStax Enterprise
'dse-5.1', // Legacy DataStax Enterprise
'dse-6.0', // Previous DataStax Enterprise
'dse-6.7', // Current DataStax Enterprise
'dse-6.8' // Development DataStax Enterprise
'dse-5.1.35', // Legacy DataStax Enterprise
'dse-6.8.30' // Development DataStax Enterprise
}
}
when {
Expand Down
2 changes: 1 addition & 1 deletion cmake/ClangFormat.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Format and verify formatting using clang-format
#
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

include(FindPackageHandleStandardArgs)

Expand Down
2 changes: 1 addition & 1 deletion examples/async/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME async)
Expand Down
2 changes: 1 addition & 1 deletion examples/auth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME auth)
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME basic)
Expand Down
2 changes: 1 addition & 1 deletion examples/batch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME batch)
Expand Down
2 changes: 1 addition & 1 deletion examples/bind_by_name/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME bind_by_name)
Expand Down
2 changes: 1 addition & 1 deletion examples/callbacks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME callbacks)
Expand Down
2 changes: 1 addition & 1 deletion examples/cloud/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME cloud)
Expand Down
2 changes: 1 addition & 1 deletion examples/collections/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME collections)
Expand Down
2 changes: 1 addition & 1 deletion examples/concurrent_executions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME concurrent_executions)
Expand Down
2 changes: 1 addition & 1 deletion examples/date_time/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME date_time)
Expand Down
2 changes: 1 addition & 1 deletion examples/dse/date_range/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME date_range)
Expand Down
2 changes: 1 addition & 1 deletion examples/dse/geotypes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME geotypes)
Expand Down
2 changes: 1 addition & 1 deletion examples/dse/gssapi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")

Expand Down
2 changes: 1 addition & 1 deletion examples/dse/plaintext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")

Expand Down
2 changes: 1 addition & 1 deletion examples/dse/proxy_execution/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME proxy_execution)
Expand Down
2 changes: 1 addition & 1 deletion examples/duration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME duration)
Expand Down
2 changes: 1 addition & 1 deletion examples/execution_profiles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME execution_profiles)
Expand Down
2 changes: 1 addition & 1 deletion examples/host_listener/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME host_listener)
Expand Down
2 changes: 1 addition & 1 deletion examples/logging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME logging)
Expand Down
2 changes: 1 addition & 1 deletion examples/maps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME maps)
Expand Down
2 changes: 1 addition & 1 deletion examples/named_parameters/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME named_parameters)
Expand Down
2 changes: 1 addition & 1 deletion examples/paging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME paging)
Expand Down
2 changes: 1 addition & 1 deletion examples/perf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME perf)
Expand Down
2 changes: 1 addition & 1 deletion examples/prepared/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME prepared)
Expand Down
2 changes: 1 addition & 1 deletion examples/schema_meta/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
set(PROJECT_EXAMPLE_NAME schema_meta)
Expand Down
Loading