Skip to content

Commit 689b5cf

Browse files
committed
CI: updates for ArangoDB 3.12
1 parent 58e9f0f commit 689b5cf

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

Diff for: .github/workflows/resilience.yml

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919

2020
jobs:
2121
test:
22+
if: '! github.event.pull_request.draft'
2223
timeout-minutes: 20
2324
runs-on: ubuntu-latest
2425

@@ -37,6 +38,8 @@ jobs:
3738
run: ./docker/start_db.sh
3839
env:
3940
STARTER_MODE: cluster
41+
DOCKER_IMAGE: docker.io/arangodb-preview:devel-nightly
42+
COMPRESSION: true
4043
- name: Info
4144
run: mvn -version
4245
- name: Start Toxiproxy

Diff for: .github/workflows/test.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,20 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
docker-img:
31-
- docker.io/arangodb/arangodb:3.10.11
3231
- docker.io/arangodb/arangodb:3.11.6
33-
- docker.io/arangodb/enterprise:3.10.11
3432
- docker.io/arangodb/enterprise:3.11.6
3533
- docker.io/arangodb-preview:devel-nightly
3634
topology:
3735
- single
3836
- cluster
3937
- activefailover
40-
db-ext-names:
41-
- false
4238
java-version:
4339
- 21
4440
user-language:
4541
- en
42+
exclude:
43+
- docker-img: docker.io/arangodb-preview:devel-nightly
44+
topology: activefailover
4645

4746
steps:
4847
- uses: actions/checkout@v2
@@ -58,7 +57,6 @@ jobs:
5857
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
5958
STARTER_MODE: ${{matrix.topology}}
6059
DOCKER_IMAGE: ${{matrix.docker-img}}
61-
EXTENDED_NAMES: ${{matrix.db-ext-names}}
6260
- name: Info
6361
run: mvn -version
6462
- name: Test
@@ -130,8 +128,6 @@ jobs:
130128
- single
131129
- cluster
132130
- activefailover
133-
db-ext-names:
134-
- false
135131
java-version:
136132
- 11
137133
user-language:
@@ -151,7 +147,6 @@ jobs:
151147
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
152148
STARTER_MODE: ${{matrix.topology}}
153149
DOCKER_IMAGE: ${{matrix.docker-img}}
154-
EXTENDED_NAMES: ${{matrix.db-ext-names}}
155150
- name: Set JWT
156151
run: |
157152
ENDPOINT=$(./docker/find_active_endpoint.sh)
@@ -184,8 +179,6 @@ jobs:
184179
- docker.io/arangodb/arangodb:3.11.6
185180
topology:
186181
- single
187-
db-ext-names:
188-
- false
189182
java-version:
190183
- 21
191184
user-language:
@@ -205,7 +198,6 @@ jobs:
205198
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
206199
STARTER_MODE: ${{matrix.topology}}
207200
DOCKER_IMAGE: ${{matrix.docker-img}}
208-
EXTENDED_NAMES: ${{matrix.db-ext-names}}
209201
- name: Info
210202
run: mvn -version
211203
- name: Test
@@ -269,8 +261,6 @@ jobs:
269261
- docker.io/arangodb/enterprise:3.11.6
270262
topology:
271263
- cluster
272-
db-ext-names:
273-
- false
274264
java-version:
275265
- 17
276266

@@ -290,7 +280,6 @@ jobs:
290280
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
291281
STARTER_MODE: ${{matrix.topology}}
292282
DOCKER_IMAGE: ${{matrix.docker-img}}
293-
EXTENDED_NAMES: ${{matrix.db-ext-names}}
294283
- name: Info
295284
run: mvn -version
296285
- name: Cache SonarCloud packages

Diff for: docker/start_db.sh

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# STARTER_MODE: (single|cluster|activefailover), default single
55
# DOCKER_IMAGE: ArangoDB docker image, default docker.io/arangodb/arangodb:latest
66
# SSL: (true|false), default false
7-
# EXTENDED_NAMES: (true|false), default false
87
# ARANGO_LICENSE_KEY: only required for ArangoDB Enterprise
98

109
# EXAMPLE:
@@ -13,7 +12,7 @@
1312
STARTER_MODE=${STARTER_MODE:=single}
1413
DOCKER_IMAGE=${DOCKER_IMAGE:=docker.io/arangodb/arangodb:latest}
1514
SSL=${SSL:=false}
16-
EXTENDED_NAMES=${EXTENDED_NAMES:=false}
15+
COMPRESSION=${COMPRESSION:=false}
1716

1817
STARTER_DOCKER_IMAGE=docker.io/arangodb/arangodb-starter:latest
1918
GW=172.28.0.1
@@ -46,8 +45,8 @@ if [ "$SSL" == "true" ]; then
4645
ARANGOSH_SCHEME=http+ssl
4746
fi
4847

49-
if [ "$EXTENDED_NAMES" == "true" ]; then
50-
STARTER_ARGS="${STARTER_ARGS} --all.database.extended-names=true"
48+
if [ "$COMPRESSION" == "true" ]; then
49+
STARTER_ARGS="${STARTER_ARGS} --all.http.compress-response-threshold=1"
5150
fi
5251

5352
if [ "$USE_MOUNTED_DATA" == "true" ]; then
@@ -71,7 +70,7 @@ docker run -d \
7170
--starter.address="${GW}" \
7271
--docker.image="${DOCKER_IMAGE}" \
7372
--starter.local --starter.mode=${STARTER_MODE} --all.log.level=debug --all.log.output=+ --log.verbose \
74-
--all.server.descriptors-minimum=1024 --all.javascript.allow-admin-execute=true --all.http.compress-response-threshold=1
73+
--all.server.descriptors-minimum=1024 --all.javascript.allow-admin-execute=true
7574

7675

7776
wait_server() {

0 commit comments

Comments
 (0)