[gem5-dev] [S] Change in gem5/gem5[stable]: misc: Update GitHub yaml files
Melissa Jost has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/71400?usp=email )
Change subject: misc: Update GitHub yaml files
..
misc: Update GitHub yaml files
This introduces a few fixes to the yaml files, such as fixing
the failing SystemC tests by removing an extra Docker container,
declaring the Python version for our compiler tests, fixing
typos in the GPU daily tests, and adjusting the timeout values
for our compiler tests and unittests.
Change-Id: I3b4f2220750138783717b3678b0d8676155cb2a1
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71400
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
Tested-by: kokoro
Maintainer: Matt Sinclair
Reviewed-by: Matt Sinclair
---
M .github/workflows/ci-tests.yaml
M .github/workflows/compiler-tests.yaml
M .github/workflows/daily-tests.yaml
3 files changed, 26 insertions(+), 23 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
Matt Sinclair: Looks good to me, but someone else must approve; Looks
good to me, approved
kokoro: Regressions pass
diff --git a/.github/workflows/ci-tests.yaml
b/.github/workflows/ci-tests.yaml
index 309fefc..16c096d 100644
--- a/.github/workflows/ci-tests.yaml
+++ b/.github/workflows/ci-tests.yaml
@@ -8,9 +8,18 @@
types: [opened, reopened, edited]
jobs:
+ pre-commit:
+# runs on github hosted runner
+runs-on: ubuntu-22.04
+steps:
+- uses: actions/checkout@v3
+- uses: actions/setup-python@v3
+- uses: pre-commit/action@v3.0.0
+
build-gem5:
runs-on: [self-hosted, linux, x64, build]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+needs: pre-commit # only runs if pre-commit passes
outputs:
artifactname: ${{ steps.name.outputs.test }}
steps:
@@ -29,8 +38,8 @@
unittests-all-opt:
runs-on: [self-hosted, linux, x64, run]
-container:
- image: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+needs: pre-commit # only runs if pre-commit passes
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
@@ -42,7 +51,7 @@
testlib-quick:
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
-needs: build-gem5
+needs: [pre-commit, build-gem5]
timeout-minutes: 360 # 6 hours
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/compiler-tests.yaml
b/.github/workflows/compiler-tests.yaml
index 300f9eb..e7e9cd2 100644
--- a/.github/workflows/compiler-tests.yaml
+++ b/.github/workflows/compiler-tests.yaml
@@ -18,7 +18,7 @@
opts: [.opt, .fast]
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/${{ matrix.image }}:latest
-timeout-minutes: 2880 # 48 hours
+timeout-minutes: 240 # 4 hours
steps:
- uses: actions/checkout@v3
with:
@@ -26,7 +26,7 @@
# therefore need to explicitly checkout the develop branch.
ref: develop
- name: Compile build/ALL/gem5${{ matrix.opts }} with ${{ matrix.image
}}
- run: scons build/ALL/gem5${{ matrix.opts }}
+ run: /usr/bin/env python3 /usr/bin/scons --ignore-style
build/ALL/gem5${{ matrix.opts }}
# Tests the two latest gcc and clang supported compilers against all
gem5 compilations.
latest-compilers-all-gem5-builds:
@@ -37,7 +37,7 @@
opts: [.opt, .fast]
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/${{ matrix.image }}:latest
-timeout-minutes: 2880 # 48 hours
+timeout-minutes: 240 # 4 hours
steps:
- uses: actions/checkout@v3
with:
@@ -45,4 +45,4 @@
# therefore need to explicitly checkout the develop branch.
ref: develop
- name: Compile build/${{ matrix.gem5-compilation }}/gem5${{
matrix.opts }} with ${{ matrix.image }}
- run: scons build/${{ matrix.gem5-compilation }}/gem5${{ matrix.opts
}}
+ run: /usr/bin/env python3 /usr/bin/scons --ignore-style build/${{
matrix.gem5-compilation }}/gem5${{ matrix.opts }}
diff --git a/.github/workflows/daily-tests.yaml
b/.github/workflows/daily-tests.yaml
index 91bb7d6..97b4164 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -223,7 +223,7 @@
unittests-all-debug:
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
-timeout-minutes: 30
+timeout-minutes: 60
steps:
- uses: actions/checkout@v3
@@ -240,7 +240,7 @@
unittests-all-fast:
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
-timeout-minutes: 30
+timeout-minutes: 60
steps:
- uses: actions/checkout@v3
@@ -837,22 +837,16 @@
# therefore ne
[gem5-dev] [S] Change in gem5/gem5[stable]: misc: Update GitHub yaml files
Melissa Jost has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/71400?usp=email )
Change subject: misc: Update GitHub yaml files
..
misc: Update GitHub yaml files
This introduces a few fixes to the yaml files, such as fixing
the failing SystemC tests by removing an extra Docker container,
declaring the Python version for our compiler tests, fixing
typos in the GPU daily tests, and adjusting the timeout values
for our compiler tests and unittests.
Change-Id: I3b4f2220750138783717b3678b0d8676155cb2a1
---
M .github/workflows/ci-tests.yaml
M .github/workflows/compiler-tests.yaml
M .github/workflows/daily-tests.yaml
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/ci-tests.yaml
b/.github/workflows/ci-tests.yaml
index 309fefc..16c096d 100644
--- a/.github/workflows/ci-tests.yaml
+++ b/.github/workflows/ci-tests.yaml
@@ -8,9 +8,18 @@
types: [opened, reopened, edited]
jobs:
+ pre-commit:
+# runs on github hosted runner
+runs-on: ubuntu-22.04
+steps:
+- uses: actions/checkout@v3
+- uses: actions/setup-python@v3
+- uses: pre-commit/action@v3.0.0
+
build-gem5:
runs-on: [self-hosted, linux, x64, build]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+needs: pre-commit # only runs if pre-commit passes
outputs:
artifactname: ${{ steps.name.outputs.test }}
steps:
@@ -29,8 +38,8 @@
unittests-all-opt:
runs-on: [self-hosted, linux, x64, run]
-container:
- image: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+needs: pre-commit # only runs if pre-commit passes
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
@@ -42,7 +51,7 @@
testlib-quick:
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
-needs: build-gem5
+needs: [pre-commit, build-gem5]
timeout-minutes: 360 # 6 hours
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/compiler-tests.yaml
b/.github/workflows/compiler-tests.yaml
index 300f9eb..57401f4 100644
--- a/.github/workflows/compiler-tests.yaml
+++ b/.github/workflows/compiler-tests.yaml
@@ -18,7 +18,7 @@
opts: [.opt, .fast]
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/${{ matrix.image }}:latest
-timeout-minutes: 2880 # 48 hours
+timeout-minutes: 240 # 4 hours
steps:
- uses: actions/checkout@v3
with:
@@ -37,7 +37,7 @@
opts: [.opt, .fast]
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/${{ matrix.image }}:latest
-timeout-minutes: 2880 # 48 hours
+timeout-minutes: 240 # 4 hours
steps:
- uses: actions/checkout@v3
with:
diff --git a/.github/workflows/daily-tests.yaml
b/.github/workflows/daily-tests.yaml
index 91bb7d6..97b4164 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -223,7 +223,7 @@
unittests-all-debug:
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
-timeout-minutes: 30
+timeout-minutes: 60
steps:
- uses: actions/checkout@v3
@@ -240,7 +240,7 @@
unittests-all-fast:
runs-on: [self-hosted, linux, x64, run]
container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
-timeout-minutes: 30
+timeout-minutes: 60
steps:
- uses: actions/checkout@v3
@@ -837,22 +837,16 @@
# therefore need to explicitly checkout the develop branch.
ref: develop
- name: Build ARM/gem5.opt
- uses: docker://gcr.io/gem5-test/ubuntu-22.04_min-dependencies:latest
- # This is a bit of a hack so we can run a different docker container.
- with:
-args: scons --ignore-style --duplicate-sources -j4
build/ARM/gem5.opt
+ run: scons build/ARM/gem5.opt --ignore-style --duplicate-sources
-j$(nproc)
- name: Build ARM/libgem5_opt.so
- uses: docker://gcr.io/gem5-test/ubuntu-22.04_min-dependencies:latest
- # This is a bit of a hack so we can run a different docker container.
- with:
-args: scons --with-cxx-config --without-python --without-tcmalloc
USE_SYSTEMC=0 -j4 --duplicate-sources build/ARM/libgem5_opt.so
+ run: scons build/ARM/libgem5_opt.so --with-cxx-config
--without-python --without-tcmalloc USE_SYSTEMC=0 -j$(nproc)
--duplicate-sources
- name: Compile gem5 withing SystemC
working-directory: ${{ github.workspace
}}/util/systemc/gem5_within_systemc
run: make
- name: Run gem5 within SystemC test
run: ./build/ARM/gem5.opt configs/deprecated/example/se.py -c
tests/test-progs/hello/bin/arm/linux/hello
-- name: bla
- run:
LD_LIBRARY_PATH=build/ARM/:/op
