From 70f8c49e8b2bd54565166eaa96d120e549eaa446 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Fri, 6 Oct 2023 01:17:41 -0700 Subject: [PATCH] tests,misc: Remove 'run' and 'build' labels All runners are now equal, these labels are pointless. Change-Id: I9d5fb31e20e95d30e9726d4bf0353dc87af614d7 --- .github/workflows/ci-tests.yaml | 10 +++++----- .github/workflows/compiler-tests.yaml | 4 ++-- .github/workflows/daily-tests.yaml | 14 +++++++------- .github/workflows/docker-build.yaml | 4 ++-- .github/workflows/gpu-tests.yaml | 4 ++-- .github/workflows/weekly-tests.yaml | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml index 5a92422e79..103de52b31 100644 --- a/.github/workflows/ci-tests.yaml +++ b/.github/workflows/ci-tests.yaml @@ -47,7 +47,7 @@ jobs: exit 1 unittests-all-opt: - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] if: github.event.pull_request.draft == false container: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest needs: [pre-commit, check-for-change-id] # only runs if pre-commit and change-id passes @@ -60,7 +60,7 @@ jobs: - run: echo "This job's status is ${{ job.status }}." testlib-quick-matrix: - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] if: github.event.pull_request.draft == false # In order to make sure the environment is exactly the same, we run in # the same container we use to build gem5 and run the testlib tests. This @@ -89,7 +89,7 @@ jobs: test-dirs-matrix: ${{ steps.dir-matrix.outputs.test-dirs-matrix }} testlib-quick-gem5-builds: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] if: github.event.pull_request.draft == false container: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest needs: [pre-commit, check-for-change-id, testlib-quick-matrix] @@ -119,7 +119,7 @@ jobs: retention-days: 7 testlib-quick-execution: - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] if: github.event.pull_request.draft == false container: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest needs: [pre-commit, check-for-change-id, testlib-quick-matrix, testlib-quick-gem5-builds] @@ -174,7 +174,7 @@ jobs: # merged. The 'testlib-quick-execution' is a matrix job which runs all the # the testlib quick tests. This job is therefore a stub which will pass if # all the testlib-quick-execution jobs pass. - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] needs: testlib-quick-execution steps: - run: echo "This job's status is ${{ job.status }}." diff --git a/.github/workflows/compiler-tests.yaml b/.github/workflows/compiler-tests.yaml index 595e231323..5bd6a8d165 100644 --- a/.github/workflows/compiler-tests.yaml +++ b/.github/workflows/compiler-tests.yaml @@ -17,7 +17,7 @@ jobs: matrix: image: [gcc-version-12, gcc-version-11, gcc-version-10, gcc-version-9, gcc-version-8, clang-version-16, clang-version-15, clang-version-14, clang-version-13, clang-version-12, clang-version-11, clang-version-10, clang-version-9, clang-version-8, clang-version-7, ubuntu-20.04_all-dependencies, ubuntu-22.04_all-dependencies, ubuntu-22.04_min-dependencies] opts: [.opt, .fast] - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] timeout-minutes: 2880 # 48 hours container: gcr.io/gem5-test/${{ matrix.image }}:latest steps: @@ -38,7 +38,7 @@ jobs: gem5-compilation: [ARM, ARM_MESI_Three_Level, ARM_MESI_Three_Level_HTM, ARM_MOESI_hammer, Garnet_standalone, GCN3_X86, MIPS, 'NULL', NULL_MESI_Two_Level, NULL_MOESI_CMP_directory, NULL_MOESI_CMP_token, NULL_MOESI_hammer, POWER, RISCV, SPARC, X86, X86_MI_example, X86_MOESI_AMD_Base, VEGA_X86, GCN3_X86] image: [gcc-version-12, clang-version-16] opts: [.opt] - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] timeout-minutes: 2880 # 48 hours container: gcr.io/gem5-test/${{ matrix.image }}:latest steps: diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml index 06d37c86a8..86dba0c139 100644 --- a/.github/workflows/daily-tests.yaml +++ b/.github/workflows/daily-tests.yaml @@ -36,7 +36,7 @@ jobs: command-line: --default=ALL PROTOCOL=MESI_Two_Level -j $(nproc) - image: NULL_MI_example command-line: --default=NULL PROTOCOL=MI_example -j $(nproc) - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] needs: name-artifacts container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest steps: @@ -59,7 +59,7 @@ jobs: strategy: matrix: type: [fast, debug] - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest timeout-minutes: 60 steps: @@ -77,7 +77,7 @@ jobs: fail-fast: false matrix: test-type: [arm_boot_tests, fs, gpu, insttest_se, learning_gem5, m5threads_test_atomic, memory, multi_isa, replacement_policies, riscv_boot_tests, stdlib, x86_boot_tests] - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest needs: [name-artifacts, build-gem5] timeout-minutes: 1440 # 24 hours for entire matrix to run @@ -164,7 +164,7 @@ jobs: # split library example tests into runs based on Suite UID # so that they don't hog the runners for too long testlib-long-gem5_library_example_tests: - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] strategy: fail-fast: false matrix: @@ -210,7 +210,7 @@ jobs: # This runs the SST-gem5 integration compilation and tests it with # ext/sst/sst/example.py. sst-test: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/sst-env:latest timeout-minutes: 180 @@ -232,7 +232,7 @@ jobs: # This runs the gem5 within SystemC ingration and runs a simple hello-world # simulation with it. systemc-test: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/systemc-env:latest timeout-minutes: 180 @@ -256,7 +256,7 @@ jobs: # Runs the gem5 Nighyly GPU tests. gpu-tests: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/gcn-gpu:latest timeout-minutes: 720 # 12 hours diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 19cf02c582..c0dc7bcb36 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: obtain-dockerfiles: - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] container: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest steps: @@ -20,7 +20,7 @@ jobs: # This builds and pushes the docker image. build-and-push: - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] needs: obtain-dockerfiles permissions: packages: write diff --git a/.github/workflows/gpu-tests.yaml b/.github/workflows/gpu-tests.yaml index c6e0155ecf..98f2529b92 100644 --- a/.github/workflows/gpu-tests.yaml +++ b/.github/workflows/gpu-tests.yaml @@ -11,7 +11,7 @@ on: jobs: build-gem5: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/gcn-gpu:latest steps: - uses: actions/checkout@v3 @@ -29,7 +29,7 @@ jobs: - run: echo "This job's status is ${{ job.status }}." HACC-tests: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/gcn-gpu:latest needs: build-gem5 timeout-minutes: 120 # 2 hours diff --git a/.github/workflows/weekly-tests.yaml b/.github/workflows/weekly-tests.yaml index 782647cb81..875bff12f7 100644 --- a/.github/workflows/weekly-tests.yaml +++ b/.github/workflows/weekly-tests.yaml @@ -11,7 +11,7 @@ on: jobs: build-gem5: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest outputs: build-name: ${{ steps.artifact-name.outputs.name }} @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: test-type: [gem5_library_example_tests, gem5_resources, parsec_benchmarks, x86_boot_tests] - runs-on: [self-hosted, linux, x64, run] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest needs: [build-gem5] timeout-minutes: 4320 # 3 days @@ -79,7 +79,7 @@ jobs: - run: echo "This job's status is ${{ job.status }}." dramsys-tests: - runs-on: [self-hosted, linux, x64, build] + runs-on: [self-hosted, linux, x64] container: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest timeout-minutes: 4320 # 3 days steps: