Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Remove triggered test

Michal Rutka3af49908a855
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 066b67f7c..3a4f6a16f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,29 +249,6 @@ build FAILED:
- when: on_failure
test-master:
- stage: test
- before_script:
- - docker run -v $(pwd):/or
- -v /var/run/docker.sock:/var/run/docker.sock "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- /bin/sh -c "docker-compose -f profile/dev-testing.yml pull"
- - docker run -v $(pwd):/or
- -v /var/run/docker.sock:/var/run/docker.sock "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- /bin/sh -c "docker-compose -f profile/dev-testing.yml up --no-build -d"
- script:
- - docker run --network host -v $(pwd):/or "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- /bin/sh -c "./gradlew clean test"
- rules:
- - if: $CI_COMMIT_MESSAGE !~ /skip-test/
- artifacts:
- when: on_failure
- paths:
- - "test/build/reports/tests/test/*"
- - "test/build/reports/tests/test/*/*"
- expire_in: 4 weeks
- retry:
- max: 2
-
-test-master-trigger:
stage: test
before_script:
- docker run -v $(pwd):/or
@@ -285,9 +262,8 @@ test-master-trigger:
/bin/sh -c "./gradlew clean test"
rules:
- if: $RUN_TESTS == "true"
- # when: always
- #- if: $RUN_TESTS != "true"
when: never
+ - if: $CI_COMMIT_MESSAGE !~ /skip-test/
artifacts:
when: on_failure
paths: