Skip to content

Commit b9280bf

Browse files
Feature/arm support (#719)
* done modifications in config, Makefile and cluster for ARM support * modified config file to reuse environment variables * Updated TEST_RESOURCES env var in config file * changes in config file for persist to workspace path * commented DB extra features (compression) (ARM) from config file
1 parent ca9b065 commit b9280bf

File tree

1 file changed

+29
-15
lines changed

1 file changed

+29
-15
lines changed

.circleci/config.yml

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,22 @@ parameters:
4949
type: string
5050
default: "arangodb/arangodb-starter:latest"
5151

52+
commands:
53+
run-test-if-pr:
54+
description: "Run a test command only if this is a pull request"
55+
parameters:
56+
test-command:
57+
type: string
58+
steps:
59+
- run:
60+
name: Run integration tests
61+
command: |
62+
if [ -z "$CIRCLE_PULL_REQUEST" ]; then
63+
echo "This is not a pull request. Skipping..."
64+
exit 0
65+
fi
66+
<< parameters.test-command >>
67+
5268
jobs:
5369

5470
check-code:
@@ -77,17 +93,17 @@ jobs:
7793
name: Download itzpapalotl demo foxx service
7894
command: |
7995
if [ -z "$CIRCLE_PULL_REQUEST" ]; then
80-
echo "This is not a pull request. Skipping..."
96+
echo "This is not a pull request. Skipping download..."
8197
exit 0
8298
fi
8399
if ! [ -f "$HOME/resources/itzpapalotl-v1.2.0.zip" ]; then
84100
curl -L0 -o $HOME/resources/itzpapalotl-v1.2.0.zip \
85101
"https://github.com/arangodb-foxx/demo-itzpapalotl/archive/v1.2.0.zip"
86102
fi
87103
- persist_to_workspace:
88-
root: /home/circleci/resources
104+
root: /home/circleci
89105
paths:
90-
- itzpapalotl-v1.2.0.zip
106+
- resources
91107

92108

93109
# ----------------------------------------
@@ -111,9 +127,8 @@ jobs:
111127
- run:
112128
name: Ensure resources directory exists
113129
command: mkdir -p $HOME/resources
114-
- run:
115-
name: Run integration tests
116-
command: make << parameters.test-to-run >>
130+
- run-test-if-pr:
131+
test-command: make << parameters.test-to-run >>
117132
environment:
118133
<<: *integration_test_env
119134

@@ -143,9 +158,8 @@ jobs:
143158
command: |
144159
echo 'export DOCKER_PLATFORM="--platform linux/arm64"' >> $BASH_ENV
145160
echo 'export DOCKER_BUILD_PLATFORM="--platform linux/arm64"' >> $BASH_ENV
146-
- run:
147-
name: Run integration tests
148-
command: make << parameters.test-to-run >>
161+
- run-test-if-pr:
162+
test-command: make << parameters.test-to-run >>
149163
environment:
150164
<<: *integration_test_env
151165

@@ -219,12 +233,12 @@ workflows:
219233
- download-demo-data
220234
test-to-run: run-v2-tests-cluster
221235

222-
- run-integration-tests-arm:
223-
name: Test V2 cluster - DB extra features (compression) (ARM)
224-
requires:
225-
- download-demo-data
226-
test-to-run: run-v2-tests-cluster
227-
enable-extra-db-features: true
236+
# - run-integration-tests-arm:
237+
# name: Test V2 cluster - DB extra features (compression) (ARM)
238+
# requires:
239+
# - download-demo-data
240+
# test-to-run: run-v2-tests-cluster
241+
# enable-extra-db-features: true
228242

229243
- run-integration-tests-arm:
230244
name: Test V2 single (ARM)

0 commit comments

Comments
 (0)