Skip to content

Commit aa0a67a

Browse files
wip
1 parent 8c1a245 commit aa0a67a

File tree

1 file changed

+7
-72
lines changed

1 file changed

+7
-72
lines changed

.circleci/config.yml

Lines changed: 7 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
executors:
4-
docker-amd64: # Docker using the Base Convenience Image
4+
docker-amd64-image:
55
parameters:
66
maven-image:
77
type: string
@@ -13,7 +13,7 @@ executors:
1313
- INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01
1414
- INFLUXDB3_OBJECT_STORE=file
1515
- INFLUXDB3_DB_DIR=/var/lib/influxdb3/data
16-
docker-arm64: # Docker using the Base Convenience Image
16+
docker-arm64-image:
1717
parameters:
1818
maven-image:
1919
type: string
@@ -58,7 +58,6 @@ commands:
5858
uname -m
5959
sudo chmod +x codecov
6060
61-
6261
jobs:
6362
tests-java:
6463
parameters:
@@ -67,7 +66,7 @@ jobs:
6766
default: &default-maven-image "cimg/openjdk:11.0"
6867
exe:
6968
type: executor
70-
default: docker-amd64
69+
default: docker-amd64-image
7170
arg-line:
7271
type: string
7372
default: "--add-opens=java.base/java.nio=ALL-UNNAMED"
@@ -112,79 +111,15 @@ jobs:
112111
path: artifacts
113112
- when:
114113
condition:
115-
equal: [ docker-amd64, << parameters.exe >> ]
114+
equal: [ docker-amd64-image, << parameters.exe >> ]
116115
steps:
117116
- upload-codecov-amd64
118117
- when:
119118
condition:
120-
equal: [ docker-arm64, << parameters.exe >> ]
119+
equal: [ docker-arm64-image, << parameters.exe >> ]
121120
steps:
122121
- upload-codecov-arm64
123122

124-
125-
# tests-java-arm64:
126-
# parameters:
127-
# maven-image:
128-
# type: string
129-
# default: &default-maven-image "cimg/openjdk:11.0"
130-
# architecture:
131-
# type: enum
132-
# default: ""
133-
# arg-line:
134-
# type: string
135-
# default: ""
136-
# docker:
137-
# - image: << parameters.maven-image >>
138-
# - image: influxdb:3-core
139-
# environment:
140-
# - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01
141-
# - INFLUXDB3_OBJECT_STORE=file
142-
# - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data
143-
# resource_class: arm.medium
144-
# steps:
145-
# - checkout
146-
# - restore_cache:
147-
# name: Restoring Maven Cache
148-
# keys:
149-
# - &cache-key maven-cache_v1-<< parameters.maven-image >>-{{ checksum "pom.xml" }}
150-
# - maven-cache_v3-<< parameters.maven-image >>-
151-
# - run:
152-
# name: "aaa"
153-
# command: |
154-
# sudo apt-get update
155-
# sudo apt-get install -y jq
156-
# - run:
157-
# name: Setup InfluxDB service
158-
# command: |
159-
# ./scripts/influxdb-setup.sh \
160-
# --export-url-as TESTING_INFLUXDB_URL \
161-
# --export-db-as TESTING_INFLUXDB_DATABASE \
162-
# --export-token-as TESTING_INFLUXDB_TOKEN
163-
# - run:
164-
# name: "Running tests"
165-
# command: |
166-
# mvn -B -U clean install -DargLine="@{argLine} << parameters.arg-line >>"
167-
# - save_cache:
168-
# name: Saving Maven Cache
169-
# key: *cache-key
170-
# paths:
171-
# - ~/.m2
172-
# - run:
173-
# name: "Copying test results"
174-
# when: always
175-
# command: |
176-
# mkdir test-results
177-
# cp target/surefire-reports/*.xml test-results/ || true
178-
# - store_test_results:
179-
# path: test-results
180-
# - run:
181-
# name: "Copying artifacts"
182-
# command: |
183-
# mkdir artifacts
184-
# cp -r target/*.jar artifacts/
185-
# - store_artifacts:
186-
# path: artifacts
187-
# - upload-codecov
188123
check-dependencies:
189124
parameters:
190125
maven-image:
@@ -284,8 +219,8 @@ workflows:
284219
- tests-java:
285220
matrix:
286221
parameters:
287-
exe: [ docker-amd64, docker-arm64 ]
288-
maven-image: [ "cimg/openjdk:17.0", "cimg/openjdk:20.0" ]
222+
exe: [ docker-amd64-image, docker-arm64-image ]
223+
maven-image: [ "cimg/openjdk:11.0", "cimg/openjdk:17.0", "cimg/openjdk:20.0", "cimg/openjdk:21.0" ]
289224
- deploy-snapshot:
290225
requires:
291226
- check-dependencies

0 commit comments

Comments
 (0)