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
Improve macOS test
Michal Rutka5195596b480d
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.ymlindex 722534754..d1bf8e964 100644--- a/.github/workflows/tests.yml+++ b/.github/workflows/tests.yml@@ -84,6 +84,7 @@ jobs:~/.dockerkey: image-cache-${{ runner.os }}- name: install docker+ id: dockerrun: |mkdir -p ~/.docker/machine/cachecurl -Lo ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso@@ -94,17 +95,18 @@ jobs:vboxmanage modifyvm default --natpf1 "postgresql,tcp,,5432,,5432"vboxmanage modifyvm default --natpf1 "keycloak,tcp,,8081,,8081"docker-machine start default+ echo "::set-output name=success::1"continue-on-error: true- name: set up JDK- if: success()+ if: steps.docker.outputs.success == 1uses: actions/setup-java@v1with:java-version: ${{ matrix.java-version }}- name: grant execute permission for gradlew- if: success()+ if: steps.docker.outputs.success == 1run: chmod +x gradlew- name: start containers needed for testing and perform test- if: success() &&+ if: steps.docker.outputs.success == 1 &&steps.cache-images.outputs.cache-hit != 'true'run: |eval "$(docker-machine env default)"@@ -117,7 +119,7 @@ jobs:# Typically it takes 10 minutes to complete tests, default timeout is 6h, to be agile we need to pivot quicker :-)timeout-minutes: 60- name: start containers needed for testing and perform test from cache- if: success() &&+ if: steps.docker.outputs.success == 1 &&steps.cache-images.outputs.cache-hit == 'true'run: |eval "$(docker-machine env default)"@@ -129,19 +131,18 @@ jobs:# Typically it takes 10 minutes to complete tests, default timeout is 6h, to be agile we need to pivot quicker :-)timeout-minutes: 60- name: check containers when failure- if: failure()+ if: steps.docker.outputs.success == 1 && failure()run: |eval "$(docker-machine env default)"docker-compose -f profile/dev-testing.yml logscontinue-on-error: true- name: Share tests artifacts- if: failure()+ if: steps.docker.outputs.success == 1 && failure()uses: actions/upload-artifact@v2with:name: tests-run-artifactspath: |test/build/reports/tests/test- continue-on-error: truetests-windows:strategy:diff --git a/mvp/aws-cloudformation.template.yml b/mvp/aws-cloudformation.template.ymlindex aacbaa0f2..938799502 100644--- a/mvp/aws-cloudformation.template.yml+++ b/mvp/aws-cloudformation.template.yml@@ -153,6 +153,7 @@ Resources:wget https://github.com/openremote/openremote/raw/master/mvp/fetch_s3_deploy.sh -O fetch.txtcat ../access.txt ./fetch.txt > fetch_s3_deploy.shchmod +x fetch_s3_deploy.sh+ rm fetch.txtInstanceSecurityGroup:Type: AWS::EC2::SecurityGroup