Skip to content

Commit e26650e

Browse files
committed
Move common env variables inside the job rather that keeping in matrix declaration
1 parent 9d272e5 commit e26650e

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ stages:
3434
.snippets:
3535
# macOS AMI will already have cmdline-tools installed
3636
install-android-api-components:
37+
- export ANDROID_EMULATOR_IMAGE=system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}
38+
- export ANDROID_PLATFORM=platforms;android-$ANDROID_API
39+
- export ANDROID_BUILD_TOOLS=build-tools;$ANDROID_API.0.0
3740
- echo y | ~/android_sdk/cmdline-tools/latest/bin/sdkmanager --install "emulator"
3841
- echo y | ~/android_sdk/cmdline-tools/latest/bin/sdkmanager --install "platform-tools"
3942
- echo y | ~/android_sdk/cmdline-tools/latest/bin/sdkmanager --install "$ANDROID_PLATFORM"
@@ -225,17 +228,8 @@ test-pyramid:core-it:
225228
parallel:
226229
matrix:
227230
- ANDROID_API: "21"
228-
ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
229-
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
230-
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
231231
- ANDROID_API: "28"
232-
ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
233-
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
234-
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
235232
- ANDROID_API: "36"
236-
ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
237-
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
238-
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
239233
script:
240234
- !reference [ .snippets, install-android-api-components ]
241235
- !reference [ .snippets, run-core-it-instrumented ]
@@ -333,17 +327,8 @@ test-pyramid:legacy-integration-instrumented:
333327
parallel:
334328
matrix:
335329
- ANDROID_API: "21"
336-
ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
337-
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
338-
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
339330
- ANDROID_API: "28"
340-
ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
341-
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
342-
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
343331
- ANDROID_API: "36"
344-
ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
345-
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
346-
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
347332
script:
348333
- !reference [ .snippets, install-android-api-components ]
349334
- !reference [ .snippets, run-legacy-integration-instrumented ]

0 commit comments

Comments
 (0)