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
CI/CD: Fix custom project paths for dev-testing profile
Rich Turner1b09d48be1a5
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.ymlindex 0205ece55..667b75b3c 100644--- a/.github/workflows/ci_cd.yml+++ b/.github/workflows/ci_cd.yml@@ -476,7 +476,20 @@ jobs:env:MANAGER_DOCKER_CMD: ${{ steps.manager-docker-command.outputs.value }}DEPLOYMENT_DOCKER_CMD: ${{ steps.deployment-docker-command.outputs.value }}-++ - name: Define dev-testing path+ id: dev-testing-path+ shell: bash+ run: |+ if [ $IS_CUSTOM_PROJECT == 'true' ]; then+ echo "::set-output name=value::openremote/profile/dev-testing.yml"+ else+ echo "::set-output name=value::profile/dev-testing.yml"+ fi++ env:+ IS_CUSTOM_PROJECT: ${{ steps.check_custom_project.outputs.files_exists }}+- name: Output inforun: |echo "************************************************************"@@ -553,7 +566,7 @@ jobs:with:path: |~/image-cache- key: ${{ runner.os }}-docker---${{ hashFiles('profile/dev-testing.yml') }}+ key: ${{ runner.os }}-docker---${{ hashFiles(steps.dev-testing-path.outputs.value) }}restore-keys: |${{ runner.os }}-docker---@@ -566,17 +579,21 @@ jobs:- name: Pull docker imagesif: ${{ steps.test-backend-command.outputs.value != '' && steps.docker-cache.outputs.cache-hit != 'true' }}run: |- docker-compose -f profile/dev-testing.yml pull+ docker-compose -f $DEV_TESTING_PATH pullkeycloak=$(docker images --filter 'reference=openremote/keycloak' --format "{{.Repository}}:{{.Tag}}")postgres=$(docker images --filter 'reference=openremote/postgresql' --format "{{.Repository}}:{{.Tag}}")docker save $keycloak | gzip > ~/image-cache/keycloak.tar.gzdocker save $postgres | gzip > ~/image-cache/postgres.tar.gzls -R ~/image-cache+ env:+ DEV_TESTING_PATH: ${{ steps.dev-testing-path.outputs.value }}- name: Start docker test servicesif: steps.test-backend-command.outputs.value != ''- run: docker-compose -f profile/dev-testing.yml up -d --no-build-+ run: docker-compose -f $DEV_TESTING_PATH up -d --no-build+ env:+ DEV_TESTING_PATH: ${{ steps.dev-testing-path.outputs.value }}+- name: Run backend testsif: steps.test-backend-command.outputs.value != ''run: ${{ steps.test-backend-command.outputs.value }}