Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the villas examples workflow #319

Merged
merged 4 commits into from
Sep 14, 2024
Merged

Fix the villas examples workflow #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b27df9
Fix the villas examples workflow
leonardocarreras Sep 13, 2024
b1af20c
Test cache deletion for problem with the fetching
leonardocarreras Sep 13, 2024
f979c7d
Add a suplementary cache
leonardocarreras Sep 13, 2024
2133f56
Update from snake case to kebab case in names of containers for villa…
leonardocarreras Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions .github/workflows/build_test_linux_fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,26 @@ jobs:
linux-fedora-examples:
name: Build Cxx examples on Fedora Linux
runs-on: ubuntu-latest
needs: [linux-fedora-dpsimpy]
container: sogno/dpsim:dev
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

- name: Restore build archive
uses: actions/download-artifact@v4
- name: Create Build Environment
run: mkdir build

- name: Setup build directory cache
uses: actions/cache@v4
with:
name: build-fedora-examples-cache-${{ github.sha }}
path: ${{ github.workspace }}/build
path: ${{ github.workspace }}/build
key: build-fedora-dir-example-cache-${{ github.ref }}

- name: Configure CMake
shell: bash
working-directory: ${{ github.workspace }}/build
run: cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 $GITHUB_WORKSPACE

- name: Build every target
shell: bash
Expand Down Expand Up @@ -197,7 +204,6 @@ jobs:
name: Scan Sourcecode with Cppcheck
runs-on: ubuntu-latest
container: sogno/dpsim:dev
#needs: [linux-fedora]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -273,10 +279,10 @@ jobs:
with:
compose_file_path: examples/villas/docker-compose-tests
container_commands: |
docker exec dpsim-compose_dpsim_1 /bin/bash -c "pip install paho-mqtt"
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "/dpsim-mqtt" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-producer.py"&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt.py"
docker exec dpsim-compose-dpsim-1 /bin/bash -c "pip install paho-mqtt"
docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "/dpsim-mqtt" -u wildcard -v&
docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-producer.py"&
docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt.py"

test-villas-examples-2:
name: Run dpsim-mqtt-import-export VILLASnode example
Expand All @@ -285,8 +291,8 @@ jobs:
with:
compose_file_path: examples/villas/docker-compose-tests
container_commands: |
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export.py"
docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export.py"

test-villas-examples-3:
name: Run dpsim-mqtt-import-export-MIMO VILLASnode example
Expand All @@ -296,8 +302,8 @@ jobs:
compose_file_path: examples/villas/docker-compose-tests
continue_on_error: true
container_commands: |
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export-MIMO.py"
docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export-MIMO.py"

test-villas-examples-4:
name: Run dpsim-file VILLASnode example
Expand All @@ -307,8 +313,8 @@ jobs:
compose_file_path: examples/villas/docker-compose-tests
continue_on_error: true
container_commands: |
docker exec dpsim-compose_dpsim_1 /bin/bash -c "sleep 3 && tail -f /dpsim/logs/output.csv"&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-file.py"
docker exec dpsim-compose-dpsim-1 /bin/bash -c "sleep 3 && tail -f /dpsim/logs/output.csv"&
docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-file.py"

test-villas-examples-5:
name: Run mqtt-cigre-mv-pf-profiles VILLASnode example
Expand All @@ -317,5 +323,5 @@ jobs:
with:
compose_file_path: examples/villas/docker-compose-tests
container_commands: |
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-cigre-mv-pf-profiles.py"
docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-cigre-mv-pf-profiles.py"
4 changes: 2 additions & 2 deletions .github/workflows/run_villas_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
path: ${{ github.workspace }}/build

- name: Start containers
run: cd ${{ inputs.compose_file_path }} && docker-compose -p dpsim-compose up -d
run: cd ${{ inputs.compose_file_path }} && docker compose -p dpsim-compose up -d

- name: Run container commands
timeout-minutes: 5
Expand All @@ -42,4 +42,4 @@ jobs:

- name: Stop containers
if: ${{ always() }}
run: cd ${{ inputs.compose_file_path }} && docker-compose -p dpsim-compose down
run: cd ${{ inputs.compose_file_path }} && docker compose -p dpsim-compose down
Loading