fixed actions mix-up

cau-se · Sep 1, 2024 · 39149b1 · 39149b1
1 parent 70b865c
commit 39149b1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/push-arm32v7.yml b/.github/workflows/push-arm32v7.yml
@@ -1,6 +1,6 @@
 name: PiCar-X Main Build on PUSH (RPI3)
 
-on: [pull_request, workflow_dispatch]
+on: [push, workflow_dispatch]
 
 env:
   REGISTRY: ghcr.io

diff --git a/.github/workflows/push-arm64v8.yml b/.github/workflows/push-arm64v8.yml
@@ -1,6 +1,6 @@
 name: PiCar-X Main Build on PUSH (RPI4)
 
-on: [pull_request, workflow_dispatch]
+on: [push, workflow_dispatch]
 
 env:
   REGISTRY: ghcr.io

diff --git a/.github/workflows/push-x64.yml b/.github/workflows/push-x64.yml
@@ -7,40 +7,52 @@ env:
 
 jobs:
   build:
-    runs-on: [self-hosted, Linux, ARM]
+    runs-on: [self-hosted, Linux, X64]
 
     steps:
       - uses: actions/checkout@v4
       - name: build core container
         working-directory: ./PiCar-X
         run: |
-          TAG=latest ARCH=arm32v7 docker compose -f docker-compose-core.yml build --no-cache
+          TAG=${{ github.sha }} docker compose -f docker-compose-core.yml build --no-cache
 
-      - uses: actions/checkout@v4
       - name: build dtp containers without gazebo
         working-directory: ./PiCar-X
         run: |
-          TAG=latest ARCH=arm32v7 docker compose -f docker-compose-dtp-no-gazebo.yml build --no-cache
+          TAG=${{ github.sha }} docker compose -f docker-compose-dtp-headless-gazebo.yml build --no-cache
 
   unit-tests:
-    runs-on: [self-hosted, Linux, ARM]
+    runs-on: [self-hosted, Linux, X64]
     needs: [build]
     steps:
       - uses: actions/checkout@v4
       - name: Run pytest in Docker container
         working-directory: ./PiCar-X
         run: |
-          docker run --rm --name picarx-unittest ghcr.io/cau-se/arches-picar-x/picarx:latest pytest ./src/core/picarx/tests
+          docker run --rm --name picarx-unittest ghcr.io/cau-se/arches-picar-x/picarx:${{ github.sha }} pytest ./src/core/picarx/tests
 
   integration-tests:
-    runs-on: [self-hosted, Linux, ARM]
+    runs-on: [self-hosted, Linux, X64]
     needs: [unit-tests]
     steps:
       - uses: actions/checkout@v4
+
       - name: Integration Test dcmotor
         working-directory: ./PiCar-X
         run: |
-          docker run --rm --name dcmotor-integration-test -v /sys/class/gpio:/sys/class/gpio -v /dev/i2c-11:/dev/i2c-11 --privileged  ghcr.io/cau-se/arches-picar-x/drivers/dcmotor:latest rostest picarx_dcmotor_driver integration_tests.test i2c_port:=/dev/i2c-11
+          docker run --rm --name dcmotor-integration-test -v /sys/class/gpio:/sys/class/gpio -v /dev/i2c-0:/dev/i2c-0 --privileged  ghcr.io/cau-se/arches-picar-x/drivers/dcmotor:${{ github.sha }} rostest picarx_dcmotor_driver integration_tests.test i2c_port:=/dev/i2c-0
+
+      - name: Speed tests using Gazebo headless
+        working-directory: ./PiCar-X
+        run: |
+          i2c=/dev/i2c-0 docker compose -f docker-compose-dtp-headless-gazebo.yml up -d
+          docker exec picar-x-picarx-gazebo-control-1 /bin/bash -c "source ./install/setup.bash && sleep 30; python3 ./src/simulation/picarx_control/tests/steering_integration_test.py"
+
+      - name: Remove running containers after tests
+        if: success() || failure()
+        working-directory: ./PiCar-X
+        run: |
+          docker compose -f docker-compose-dtp-headless-gazebo.yml down
 
   release:
     runs-on: [self-hosted, Linux, ARM]