Skip to content

Commit 5fb3e72

Browse files
authored
Enable CI (#2)
* Update runner * update maintainers * add license check tools to runner image
1 parent 29503d8 commit 5fb3e72

File tree

38 files changed

+204
-118
lines changed

38 files changed

+204
-118
lines changed

.github/linters/actionlint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
self-hosted-runner:
33
labels:
4-
- intellabs-01
4+
- ubuntu-latest

.github/workflows/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \
99
apt-get update && \
1010
apt-get install -y --no-install-recommends \
1111
python3-pip \
12+
pipx golang-go\
1213
xvfb \
1314
tk \
1415
libgl1 && \
@@ -18,6 +19,11 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \
1819
rosdep install --rosdistro=${ROS_DISTRO} --from-paths /scenario_execution/ --ignore-src -r -y && \
1920
rm -rf /var/lib/apt/lists/*
2021

22+
# install dependencies for license check
23+
RUN PIPX_HOME="" PIPX_BIN_DIR="/python_bin" pipx install -v ros-license-toolkit==1.2.2 && \
24+
GOPATH=/go go install github.com/google/[email protected]
25+
26+
# install pybullet dependencies
2127
RUN --mount=type=bind,source=.,target=/scenario_execution \
2228
pip3 install --no-cache-dir -r /scenario_execution/libs/scenario_execution_pybullet/requirements.txt --break-system-packages
2329

.github/workflows/cleanup_cache.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
cleanup:
99
permissions:
1010
actions: write
11-
runs-on: intellabs-01
11+
runs-on: ubuntu-latest
1212
steps:
1313
- name: Cleanup
1414
run: |

.github/workflows/doc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions: read-all
2020
jobs:
2121
build_docs:
2222
name: 'Build Docs'
23-
runs-on: intellabs-01
23+
runs-on: ubuntu-latest
2424
container:
2525
image: ghcr.io/sphinx-doc/sphinx:7.1.2
2626
volumes:
@@ -46,7 +46,7 @@ jobs:
4646
name: 'Deploy to GitHub Pages'
4747
needs: build_docs
4848
if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
49-
runs-on: intellabs-01
49+
runs-on: ubuntu-latest
5050
container:
5151
image: ghcr.io/sphinx-doc/sphinx:7.1.2
5252
environment:

.github/workflows/image.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121
permissions: read-all
2222
jobs:
2323
build-and-push:
24-
runs-on: intellabs-01
24+
runs-on: ubuntu-latest
2525
permissions:
2626
packages: write
2727
steps:
@@ -45,11 +45,11 @@ jobs:
4545
context: .
4646
file: .github/workflows/Dockerfile
4747
push: true
48-
tags: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref || steps.extract_branch.outputs.branch }}
48+
tags: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref || steps.extract_branch.outputs.branch }}
4949
build-args: |
5050
ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'humble' || github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}
5151
test-devcontainer:
52-
runs-on: intellabs-01
52+
runs-on: ubuntu-latest
5353
permissions:
5454
packages: write
5555
steps:

.github/workflows/scan.yml

+10-18
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions: read-all
1010
jobs:
1111
lint:
1212
name: 'Super-linter'
13-
runs-on: intellabs-01
13+
runs-on: ubuntu-latest
1414
container: 'ghcr.io/github/super-linter:v5.0.0'
1515
permissions:
1616
contents: read
@@ -39,7 +39,7 @@ jobs:
3939
FILTER_REGEX_EXCLUDE: .*/pull_request_template.md
4040
trivy:
4141
name: Trivy
42-
runs-on: intellabs-01
42+
runs-on: ubuntu-latest
4343
steps:
4444
- name: Checkout code
4545
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
@@ -52,7 +52,7 @@ jobs:
5252
vuln-type: 'os,library'
5353
bandit:
5454
name: Bandit
55-
runs-on: intellabs-01
55+
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout code
5858
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
@@ -63,29 +63,21 @@ jobs:
6363
bandit -c .github/bandit.yaml -r .
6464
license:
6565
name: License check
66-
runs-on: intellabs-01
66+
runs-on: ubuntu-latest
6767
container:
68-
image: osrf/ros:humble-desktop
68+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
6969
steps:
7070
- name: Checkout code
71-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
72-
- name: Prepare System
73-
shell: bash
74-
run: |
75-
apt update
76-
apt install -y python3-pip
77-
pip3 install ros-license-toolkit==1.2.2
78-
apt install -y golang-go
79-
go version
80-
go install github.com/google/[email protected]
71+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
8172
- name: Check for license tags
8273
shell: bash
8374
run: |
84-
find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec "$HOME"/go/bin/addlicense -check {} +
75+
find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec /go/bin/addlicense -check {} +
8576
- name: Run ros_license_toolkit for each Package
8677
shell: bash
8778
run: |
88-
git config --global --add safe.directory /__w/scenario_execution/scenario_execution
79+
git config --global --add safe.directory /__w/scenario-execution/scenario-execution
80+
git config --global --add safe.directory /venvs/ros-license-toolkit
8981
find . -name "package.xml" | while IFS= read -r pkg_file; do
9082
pkg_dir=$(dirname "$pkg_file")
9183
pkg_name=$(basename "$pkg_dir")
@@ -94,6 +86,6 @@ jobs:
9486
continue
9587
fi
9688
echo "Processing package at $pkg_dir"
97-
ros_license_toolkit "$pkg_dir"
89+
/python_bin/ros_license_toolkit "$pkg_dir"
9890
done
9991

.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions: read-all
2222
jobs:
2323
analysis:
2424
name: Scorecard analysis
25-
runs-on: intellabs-01
25+
runs-on: ubuntu-latest
2626
permissions:
2727
# Needed to upload the results to code-scanning dashboard.
2828
security-events: write

.github/workflows/test_build.yml

+33-33
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ permissions: read-all
1111
jobs:
1212
build:
1313
#TODO model dependency to image-workflow. Workaround: retrigger run after image-workflow finished.
14-
runs-on: intellabs-01
14+
runs-on: ubuntu-latest
1515
container:
16-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
16+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
1717
credentials:
1818
username: ${{ github.repository_owner }}
1919
password: ${{ secrets.GITHUB_TOKEN }}
@@ -40,9 +40,9 @@ jobs:
4040
key: ${{ runner.os }}-build-${{ github.run_number }}
4141
test-scenario-execution:
4242
needs: [build]
43-
runs-on: intellabs-01
43+
runs-on: ubuntu-latest
4444
container:
45-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
45+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
4646
credentials:
4747
username: ${{ github.repository_owner }}
4848
password: ${{ secrets.GITHUB_TOKEN }}
@@ -77,9 +77,9 @@ jobs:
7777
path: ./**/TEST.xml
7878
test-scenario-execution-ros:
7979
needs: [build]
80-
runs-on: intellabs-01
80+
runs-on: ubuntu-latest
8181
container:
82-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
82+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
8383
credentials:
8484
username: ${{ github.repository_owner }}
8585
password: ${{ secrets.GITHUB_TOKEN }}
@@ -112,9 +112,9 @@ jobs:
112112
path: ./**/TEST.xml
113113
scenario-files-validation:
114114
needs: [build]
115-
runs-on: intellabs-01
115+
runs-on: ubuntu-latest
116116
container:
117-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
117+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
118118
credentials:
119119
username: ${{ github.repository_owner }}
120120
password: ${{ secrets.GITHUB_TOKEN }}
@@ -135,9 +135,9 @@ jobs:
135135
done
136136
test-example-scenario:
137137
needs: [build]
138-
runs-on: intellabs-01
138+
runs-on: ubuntu-latest
139139
container:
140-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
140+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
141141
credentials:
142142
username: ${{ github.repository_owner }}
143143
password: ${{ secrets.GITHUB_TOKEN }}
@@ -162,9 +162,9 @@ jobs:
162162
path: test_example_scenario/test.xml
163163
test-example-library:
164164
needs: [build]
165-
runs-on: intellabs-01
165+
runs-on: ubuntu-latest
166166
container:
167-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
167+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
168168
credentials:
169169
username: ${{ github.repository_owner }}
170170
password: ${{ secrets.GITHUB_TOKEN }}
@@ -189,9 +189,9 @@ jobs:
189189
path: test_example_library/test.xml
190190
test-example-variation:
191191
needs: [build]
192-
runs-on: intellabs-01
192+
runs-on: ubuntu-latest
193193
container:
194-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
194+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
195195
credentials:
196196
username: ${{ github.repository_owner }}
197197
password: ${{ secrets.GITHUB_TOKEN }}
@@ -217,9 +217,9 @@ jobs:
217217
path: test_example_variation/test.xml
218218
test-example-nav2:
219219
needs: [build]
220-
runs-on: intellabs-01
220+
runs-on: ubuntu-latest
221221
container:
222-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
222+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
223223
credentials:
224224
username: ${{ github.repository_owner }}
225225
password: ${{ secrets.GITHUB_TOKEN }}
@@ -250,9 +250,9 @@ jobs:
250250
path: test_example_nav2/test.xml
251251
test-example-simulation:
252252
needs: [build]
253-
runs-on: intellabs-01
253+
runs-on: ubuntu-latest
254254
container:
255-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
255+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
256256
credentials:
257257
username: ${{ github.repository_owner }}
258258
password: ${{ secrets.GITHUB_TOKEN }}
@@ -283,9 +283,9 @@ jobs:
283283
path: test_example_simulation/test.xml
284284
test-example-multirobot:
285285
needs: [build]
286-
runs-on: intellabs-01
286+
runs-on: ubuntu-latest
287287
container:
288-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
288+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
289289
credentials:
290290
username: ${{ github.repository_owner }}
291291
password: ${{ secrets.GITHUB_TOKEN }}
@@ -335,9 +335,9 @@ jobs:
335335
path: test_example_multirobot/**/rosbag*
336336
test-example-external-method:
337337
needs: [build]
338-
runs-on: intellabs-01
338+
runs-on: ubuntu-latest
339339
container:
340-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
340+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
341341
credentials:
342342
username: ${{ github.repository_owner }}
343343
password: ${{ secrets.GITHUB_TOKEN }}
@@ -364,9 +364,9 @@ jobs:
364364
path: test_example_external_method/test.xml
365365
test-example-moveit2:
366366
needs: [build]
367-
runs-on: intellabs-01
367+
runs-on: ubuntu-latest
368368
container:
369-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
369+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
370370
credentials:
371371
username: ${{ github.repository_owner }}
372372
password: ${{ secrets.GITHUB_TOKEN }}
@@ -397,10 +397,10 @@ jobs:
397397
path: test_example_moveit2/test.xml
398398
test-scenario-execution-gazebo:
399399
needs: [build]
400-
runs-on: intellabs-01
400+
runs-on: ubuntu-latest
401401
timeout-minutes: 30
402402
container:
403-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
403+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
404404
credentials:
405405
username: ${{ github.repository_owner }}
406406
password: ${{ secrets.GITHUB_TOKEN }}
@@ -430,10 +430,10 @@ jobs:
430430
path: test_scenario_execution_gazebo/test.xml
431431
test-scenario-execution-nav2:
432432
needs: [build]
433-
runs-on: intellabs-01
433+
runs-on: ubuntu-latest
434434
timeout-minutes: 30
435435
container:
436-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
436+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
437437
credentials:
438438
username: ${{ github.repository_owner }}
439439
password: ${{ secrets.GITHUB_TOKEN }}
@@ -476,10 +476,10 @@ jobs:
476476
path: test_scenario_execution_nav2/test_scenario_execution_nav2/example_nav2.mp4
477477
test-scenario-execution-pybullet:
478478
needs: [build]
479-
runs-on: intellabs-01
479+
runs-on: ubuntu-latest
480480
timeout-minutes: 10
481481
container:
482-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
482+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
483483
credentials:
484484
username: ${{ github.repository_owner }}
485485
password: ${{ secrets.GITHUB_TOKEN }}
@@ -506,10 +506,10 @@ jobs:
506506
path: test_scenario_execution_pybullet/test.xml
507507
test-scenario-execution-x11:
508508
needs: [build]
509-
runs-on: intellabs-01
509+
runs-on: ubuntu-latest
510510
timeout-minutes: 3
511511
container:
512-
image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }}
512+
image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }}
513513
credentials:
514514
username: ${{ github.repository_owner }}
515515
password: ${{ secrets.GITHUB_TOKEN }}
@@ -558,7 +558,7 @@ jobs:
558558
- test-scenario-execution-nav2
559559
- test-scenario-execution-pybullet
560560
- test-scenario-execution-x11
561-
runs-on: intellabs-01
561+
runs-on: ubuntu-latest
562562
if: ${{ always() }}
563563
permissions:
564564
checks: write

dependencies/scenario_execution_py_trees_ros/package.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<name>scenario_execution_py_trees_ros</name>
55
<version>1.2.0</version>
66
<description>Fixes in py-trees-ros not yet release</description>
7-
<author email="[email protected]">Intel Labs</author>
8-
<maintainer email="[email protected]">Intel Labs</maintainer>
7+
<author>Intel Labs</author>
8+
<author email="[email protected]">Frederik Pasch</author>
9+
<author email="[email protected]">Florian Mirus</author>
10+
<maintainer email="[email protected]">Frederik Pasch</maintainer>
11+
<maintainer email="[email protected]">Florian Mirus</maintainer>
912
<license>BSD-3-Clause</license>
1013

1114
<exec_depend>py_trees_ros</exec_depend>

examples/example_multi_robot/package.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<version>1.2.0</version>
66
<description>Example Multi Robot</description>
77
<author email="[email protected]">Intel Labs</author>
8-
<maintainer email="[email protected]">Intel Labs</maintainer>
8+
<maintainer email="[email protected]">Frederik Pasch</maintainer>
9+
<maintainer email="[email protected]">Florian Mirus</maintainer>
910
<license>Apache-2.0</license>
1011

1112
<exec_depend>rclpy</exec_depend>

examples/example_scenario_control/package.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<name>example_scenario_control</name>
55
<version>1.2.0</version>
66
<description>Scenario Execution Example for Scenario Control using RVIZ</description>
7-
<author email="[email protected]">Intel Labs</author>
8-
<maintainer email="[email protected]">Intel Labs</maintainer>
7+
<author>Intel Labs</author>
8+
<author email="[email protected]">Frederik Pasch</author>
9+
<author email="[email protected]">Florian Mirus</author>
10+
<maintainer email="[email protected]">Frederik Pasch</maintainer>
11+
<maintainer email="[email protected]">Florian Mirus</maintainer>
912
<license>Apache-2.0</license>
1013

1114
<depend>scenario_execution_control</depend>

0 commit comments

Comments
 (0)