Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
429 changes: 429 additions & 0 deletions .circleci/config.yml

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions .circleci/maven-release-settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">

<profiles>
<profile>
<id>ossrh</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname>
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
</properties>
</profile>
</profiles>

<servers>
<server>
<id>ossrh</id>
<username>${env.OSSRH_USERNAME}</username>
<password>${env.OSSRH_PASSWORD}</password>
</server>
</servers>

</settings>
50 changes: 0 additions & 50 deletions .github/workflows/maven-deploy.yml

This file was deleted.

56 changes: 0 additions & 56 deletions .github/workflows/maven-release.yml

This file was deleted.

239 changes: 0 additions & 239 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,109 +24,6 @@ on:

jobs:

test:
timeout-minutes: 10
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
scala-version:
- 2.12
- 2.13
spark-version:
- 3.1
- 3.2
- 3.3
- 3.4
topology:
- single
- cluster
java-version:
- 8
- 11
docker-img:
- docker.io/arangodb/arangodb:3.11
- docker.io/arangodb/enterprise:3.11
- docker.io/arangodb/arangodb:3.12
- docker.io/arangodb/enterprise:3.12
exclude:
- scala-version: 2.13
spark-version: 3.1
- docker-img: docker.io/arangodb/arangodb:3.11
java-version: 8
- docker-img: docker.io/arangodb/enterprise:3.11
java-version: 8
- docker-img: docker.io/arangodb/enterprise:3.11
topology: single
- docker-img: docker.io/arangodb/arangodb:3.12
java-version: 11
- docker-img: docker.io/arangodb/enterprise:3.12
java-version: 8
- docker-img: docker.io/arangodb/enterprise:3.12
topology: single

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
java-version: ${{matrix.java-version}}
distribution: 'adopt'
cache: maven
- name: Start Database
run: ./docker/start_db.sh
env:
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
- name: Info
run: mvn -version
- name: Test
run: mvn -e --no-transfer-progress -Pscala-${{matrix.scala-version}} -Pspark-${{matrix.spark-version}} test

integration-tests:
timeout-minutes: 10
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
scala-version:
- 2.12
- 2.13
spark-version:
- 3.1
- 3.2
- 3.3
- 3.4
topology:
- cluster
java-version:
- 8
docker-img:
- docker.io/arangodb/arangodb:3.12
exclude:
- scala-version: 2.13
spark-version: 3.1

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
java-version: ${{matrix.java-version}}
distribution: 'adopt'
cache: maven
- name: Start Database
run: ./docker/start_db.sh
env:
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
- name: Info
run: mvn -version
- name: Install
run: mvn -e --no-transfer-progress -Pscala-${{matrix.scala-version}} -Pspark-${{matrix.spark-version}} -Dgpg.skip=true -DskipTests=true install
- name: Test
working-directory: integration-tests
run: mvn -e --no-transfer-progress -Pscala-${{matrix.scala-version}} -Pspark-${{matrix.spark-version}} test

test-python:
timeout-minutes: 10
Expand Down Expand Up @@ -185,142 +82,6 @@ jobs:
pytest python-integration-tests/integration --adb-datasource-jar ./arangodb-spark-datasource-under-test.jar --adb-hostname 172.28.0.1


testSsl:
timeout-minutes: 10
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
scala-version:
- 2.12
- 2.13
spark-version:
- 3.1
- 3.2
- 3.3
- 3.4
topology:
- single
java-version:
- 8
- 11
docker-img:
- docker.io/arangodb/arangodb:3.12
exclude:
- scala-version: 2.13
spark-version: 3.1
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
java-version: ${{matrix.java-version}}
distribution: 'adopt'
cache: maven
- name: Start Database
run: ./docker/start_db.sh
env:
SSL: true
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
- name: Info
run: mvn -version
- name: Test
run: mvn -e --no-transfer-progress -am -pl integration-tests -Pscala-${{matrix.scala-version}} -Pspark-${{matrix.spark-version}} -Dtest=org.apache.spark.sql.arangodb.datasource.SslTest -DSslTest=true -DfailIfNoTests=false test

test-older-spark-versions:
timeout-minutes: 10
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
include:
- spark-version: 3.1
scala-version: 2.12
spark-full-version: 3.1.0
- spark-version: 3.1
scala-version: 2.12
spark-full-version: 3.1.1
- spark-version: 3.1
scala-version: 2.12
spark-full-version: 3.1.2
- spark-version: 3.1
scala-version: 2.12
spark-full-version: 3.1.3
- spark-version: 3.2
scala-version: 2.12
spark-full-version: 3.2.0
- spark-version: 3.2
scala-version: 2.13
spark-full-version: 3.2.0
- spark-version: 3.2
scala-version: 2.12
spark-full-version: 3.2.1
- spark-version: 3.2
scala-version: 2.13
spark-full-version: 3.2.1
- spark-version: 3.2
scala-version: 2.12
spark-full-version: 3.2.2
- spark-version: 3.2
scala-version: 2.13
spark-full-version: 3.2.2
- spark-version: 3.2
scala-version: 2.12
spark-full-version: 3.2.3
- spark-version: 3.2
scala-version: 2.13
spark-full-version: 3.2.3
- spark-version: 3.2
scala-version: 2.12
spark-full-version: 3.2.4
- spark-version: 3.2
scala-version: 2.13
spark-full-version: 3.2.4
- spark-version: 3.3
scala-version: 2.12
spark-full-version: 3.3.0
- spark-version: 3.3
scala-version: 2.13
spark-full-version: 3.3.0
- spark-version: 3.3
scala-version: 2.12
spark-full-version: 3.3.1
- spark-version: 3.3
scala-version: 2.13
spark-full-version: 3.3.1
- spark-version: 3.3
scala-version: 2.12
spark-full-version: 3.3.2
- spark-version: 3.3
scala-version: 2.13
spark-full-version: 3.3.2
- spark-version: 3.4
scala-version: 2.12
spark-full-version: 3.4.0
- spark-version: 3.4
scala-version: 2.13
spark-full-version: 3.4.0

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: maven
- name: Start Database
run: ./docker/start_db.sh
env:
STARTER_MODE: cluster
DOCKER_IMAGE: docker.io/arangodb/arangodb:3.12
- name: Info
run: mvn -version
- name: Install
run: mvn -e --no-transfer-progress -Pscala-${{matrix.scala-version}} -Pspark-${{matrix.spark-version}} -Dgpg.skip=true -DskipTests=true install
- name: Deployment Test
run: mvn -f ./demo/pom.xml -Pscala-${{matrix.scala-version}} -Pspark-${{matrix.spark-version}} -Dspark.version=${{matrix.spark-full-version}} -DimportPath=docker/import test

## FIXME: sonar plugin requires Java 17
# sonar:
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
*.iml
**/.idea/
.directory
**/docker/jwtHeader
**/docker/jwtSecret
**/.flattened-pom.xml
__pycache__/
1 change: 1 addition & 0 deletions demo/docker/jwtHeader
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Authorization: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJhcmFuZ29kYiIsInNlcnZlcl9pZCI6ImZvbyJ9.QmuhPHkmRPJuHGxsEqggHGRyVXikV44tb5YU_yWEvEM
1 change: 1 addition & 0 deletions demo/docker/jwtSecret
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Averysecretword
Loading