Skip to content
Merged
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
31 changes: 26 additions & 5 deletions .github/actions/build-and-test/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ inputs:
required: true
default: "true"
description: Spin up aerospike enterprise server and run tests
server-type:
server-container-repo:
required: true
description: Server type `aerospike-server` or `aerospike-enterprise-server`
description: Server type `aerospike-server` or `aerospike-enterprise-server`
enable-tls:
required: false
default: "false"
description: Enable TLS for the Aerospike server and test connections

runs:
using: "composite"
Expand All @@ -42,16 +46,33 @@ runs:
# Starting test bench
- name: Run Aerospike
if: ${{ inputs.run-tests == 'true' }}
uses: ./.github/actions/run-ee-server
id: setup-aerospike-server
uses: aerospike/shared-workflows/.github/actions/setup-aerospike-server@334ad55b790658d549747b0d154407dfc730acca # latest main
with:
server-tag: ${{ inputs.server-tag }}
server-type: ${{ inputs.server-type }}
server-container-repo: ${{ inputs.server-container-repo }}
oidc-provider: ${{ inputs.oidc-provider }}
oidc-audience: ${{ inputs.oidc-audience }}
enable-tls: ${{ inputs.enable-tls }}

- name: Import CA cert into JVM trust store
if: ${{ inputs.run-tests == 'true' && inputs.enable-tls == 'true' }}
shell: bash
run: |
keytool -import -trustcacerts \
-keystore $JAVA_HOME/lib/security/cacerts \
-storepass changeit -noprompt \
-alias aerospike-ca \
-file ${{ steps.setup-aerospike-server.outputs.tls-cert-dir }}/ca.crt

# Running tests
- name: Run tests
shell: bash
if: ${{ inputs.run-tests == 'true' }}
working-directory: test
run: mvn test -DskipTests=false
run: |
if [ "${{ inputs.enable-tls }}" = "true" ]; then
mvn test -DskipTests=false "-Dargs=-tls -h 127.0.0.1:aerospike-tls:4333 -p 4333"
else
mvn test -DskipTests=false
fi
72 changes: 0 additions & 72 deletions .github/actions/run-ee-server/action.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/actions/wait-for-as-server-to-start/action.yaml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/nightly_test_servers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"7.2.0.14_2": {
"version": "7.2.0.14_2",
"type": "database-docker-dev-local/aerospike-server-enterprise",
"tls": false
},
"7.2.0.14_2-tls": {
"version": "7.2.0.14_2",
"type": "database-docker-dev-local/aerospike-server-enterprise",
"tls": true
},
"8.1.0.3_2": {
"version": "8.1.0.3_2",
"type": "database-docker-dev-local/aerospike-server-enterprise",
"tls": false
},
"8.1.0.3_2-tls": {
"version": "8.1.0.3_2",
"type": "database-docker-dev-local/aerospike-server-enterprise",
"tls": true
},
"8.1.1.0_1": {
"version": "8.1.1.0_1",
"type": "database-docker-dev-local/aerospike-server-enterprise",
"tls": false
},
"8.1.1.0_1-tls": {
"version": "8.1.1.0_1",
"type": "database-docker-dev-local/aerospike-server-enterprise",
"tls": true
}
}
4 changes: 2 additions & 2 deletions .github/workflows/build-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: Build artifact for ${{ github.event.pull_request.head.ref }} - ${{ git
on:
workflow_call:
inputs:
server-type:
server-container-repo:
type: string
required: true
java-version:
Expand Down Expand Up @@ -32,5 +32,5 @@ jobs:
run-tests: ${{ inputs.run-tests }}
server-tag: ${{ inputs.server-tag }}
crypto-type: ${{ matrix.crypto }}
server-type: ${{ inputs.server-type }}
server-container-repo: ${{ inputs.server-container-repo }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
crypto-type:
type: string
required: true
server-type:
server-container-repo:
type: string
required: true
secrets:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
with:
crypto-type: ${{ inputs.crypto-type }}
server-tag: ${{ inputs.server-tag }}
server-type: ${{ inputs.server-type }}
server-container-repo: ${{ inputs.server-container-repo }}
oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}

Expand Down
62 changes: 62 additions & 0 deletions .github/workflows/nightly-extended-tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Nightly Extended Integration Tests

permissions:
id-token: write
contents: read

on:
schedule:
- cron: '0 2 * * *'
workflow_dispatch:

jobs:
make-matrix:
runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
outputs:
input-matrix: ${{ steps.create-server-matrix.outputs.input-matrix }}
java-version: ${{ steps.get-java-version.outputs.java-version }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}

- id: create-server-matrix
uses: ./.github/actions/make-server-matrix
with:
default_json: ${{ vars.DEFAULT_SERVER_VERSIONS }}
test_servers_file_path: .github/nightly_test_servers.json

- name: Get java version
id: get-java-version
run: |
echo java-version="$(grep '<java.version>' pom.xml | sed -e 's/<[^>]*>//g' | awk '{$1=$1};1' | sed 's/^1\.8$/8/')" >> $GITHUB_OUTPUT

extended-test:
needs: make-matrix
strategy:
fail-fast: false
matrix:
entry: ${{ fromJson(needs.make-matrix.outputs.input-matrix) }}
crypto-type: [bouncycastle, gnu]
name: test-${{ matrix.entry.server }}-${{ matrix.crypto-type }}
runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: ${{ vars.JAVA_PROVIDER }}
java-version: ${{ needs.make-matrix.outputs.java-version }}

- name: Build and test
uses: ./.github/actions/build-and-test
with:
crypto-type: ${{ matrix.crypto-type }}
server-tag: ${{ matrix.entry.version }}
server-container-repo: ${{ matrix.entry.type }}
enable-tls: ${{ matrix.entry.tls }}
oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-open.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ jobs:
java-version: ${{ needs.make-matrix.outputs.java-version }}
run-tests: true
server-tag: ${{ matrix.version }}
server-type: ${{ matrix.type }}
server-container-repo: ${{ matrix.type }}
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/rb-spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"project": "clients"
}
]
}
}
38 changes: 0 additions & 38 deletions .github/workflows/scripts/wait-for-as-server-to-start.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test-branch-runner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:
source-branch: ${{ inputs.source-branch }}
run-tests: true
server-tag: ${{ matrix.entry.version }}
server-type: ${{ matrix.entry.type }}
server-container-repo: ${{ matrix.entry.type }}
secrets: inherit

6 changes: 3 additions & 3 deletions .github/workflows/test-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
server-tag:
type: string
required: true
server-type:
server-container-repo:
type: string
required: true
secrets:
Expand All @@ -32,7 +32,7 @@ on:

jobs:
build:
name: '${{ inputs.crypto-type }} build ${{inputs.source-branch}} using java-version ${{ inputs.java-version }} on ${{ inputs.server-type}}:${{ inputs.server-tag }}'
name: '${{ inputs.crypto-type }} build ${{inputs.source-branch}} using java-version ${{ inputs.java-version }} on ${{ inputs.server-container-repo}}:${{ inputs.server-tag }}'
runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
steps:
- name: Checkout code
Expand All @@ -55,7 +55,7 @@ jobs:
with:
crypto-type: ${{ inputs.crypto-type }}
server-tag: ${{ inputs.server-tag }}
server-type: ${{ inputs.server-type }}
server-container-repo: ${{ inputs.server-container-repo }}
run-tests: ${{ inputs.run-tests }}
oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
Loading