From 08ccdd30e8bf0addc15454feab923804c58ba9a2 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Wed, 10 Jan 2018 19:00:52 +0100 Subject: add unit testing to CI --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4db92eb7..0edd09a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ stages: - docker_image_sdk - docker_image_other - build + - test # When using dind, it's wise to use the overlayfs driver for # improved performance. @@ -50,6 +51,12 @@ docker_image:emulator: DOCKER_IMAGE: android-emulator <<: *build_docker_image +unit_test: + image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" + stage: test + script: + - ./gradlew test + build: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: build -- cgit v1.2.3 From dd95ed8905846ed9d715e86426609869e12f58f9 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 11 Jan 2018 12:03:34 +0100 Subject: 8773 avoid image recreation for running tests --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0edd09a9..de2572bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,6 @@ docker_image:emulator: <<: *build_docker_image unit_test: - image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: test script: - ./gradlew test -- cgit v1.2.3 From 0105cb76e1fc6b59d42dff3059d5bb9548dab372 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 11 Jan 2018 12:23:00 +0100 Subject: Revert "8773 avoid image recreation for running tests" This reverts commit dd95ed8905846ed9d715e86426609869e12f58f9. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de2572bf..0edd09a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ docker_image:emulator: <<: *build_docker_image unit_test: + image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stage: test script: - ./gradlew test -- cgit v1.2.3