Skip to content

Commit a8598b7

Browse files
committed
Configure libssl1.0.0 for SSL tests
Add installing of libssl1.0.0 on GitHub Actions for the SSL tests. Fix tc-native detection of libssl1.0.0 on Fedora systems.
1 parent 8590737 commit a8598b7

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

.github/workflows/[email protected]

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ jobs:
139139

140140
- name: Setup environment
141141
run: |
142+
sudo sh -c "echo 'deb http://security.ubuntu.com/ubuntu xenial-security main' >> /etc/apt/sources.list"
143+
sudo apt-get update
144+
sudo apt-get install libssl1.0.0
142145
pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
143146
144147
- name: Run integration tests on Cassandra (${{ matrix.cassandra-version }})
@@ -193,6 +196,9 @@ jobs:
193196

194197
- name: Setup environment
195198
run: |
199+
sudo sh -c "echo 'deb http://security.ubuntu.com/ubuntu xenial-security main' >> /etc/apt/sources.list"
200+
sudo apt-get update
201+
sudo apt-get install libssl1.0.0
196202
pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
197203
sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
198204

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ setup [Scylla CCM](https://github.com/scylladb/scylla-ccm) in its place:
9797
pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
9898
```
9999

100+
The SSL tests use `libssl.1.0.0.so`. Before starting the tests, make sure it is installed on your system
101+
(`compat-openssl10` on Fedora and `libssl1.0.0` on Ubuntu, `xenial-security` repository source).
102+
100103
Two Maven properties control its execution:
101104

102105
- `cassandra.version`: the Cassandra version. This has a default value in the root POM,

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
<test.groups>unit</test.groups>
9393
<test.osgi.skip>true</test.osgi.skip>
9494
<javadoc.opts />
95+
<!-- Append "-fedora" to os.detected.classifier for Fedora systems
96+
(see https://netty.io/wiki/forked-tomcat-native.html) -->
97+
<os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
9598
</properties>
9699

97100
<dependencyManagement>

0 commit comments

Comments
 (0)