100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Revert "Skip tests in the pipeline"
Rich Turner7b526a550db1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.ymlindex 0bde5291f..b09e28ba4 100644--- a/.gitlab-ci.yml+++ b/.gitlab-ci.yml@@ -248,9 +248,8 @@ test-master:-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"- - echo Tests are skipped+ - 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/when: delayeddiff --git a/gitlab-ci/gitlab-ci-submodule.yml b/gitlab-ci/gitlab-ci-submodule.ymlindex 2c33031e6..81db0036f 100644--- a/gitlab-ci/gitlab-ci-submodule.yml+++ b/gitlab-ci/gitlab-ci-submodule.yml@@ -155,9 +155,8 @@ test-master:-v /var/run/docker.sock:/var/run/docker.sock registry.gitlab.com/openremote/openremote:master/bin/sh -c "docker-compose -f openremote/profile/dev-testing.yml up --no-build -d"script:- #- docker run --network host -v $(pwd):/or registry.gitlab.com/openremote/openremote:master- # /bin/sh -c "./gradlew clean test"- - echo Tests are skipped+ - docker run --network host -v $(pwd):/or registry.gitlab.com/openremote/openremote:master+ /bin/sh -c "./gradlew clean test"rules:- if: $CI_COMMIT_MESSAGE !~ /skip-test/when: on_success