From a51fb77ea614b545d909bc220c566a21df09a4ca Mon Sep 17 00:00:00 2001 From: Mohamed Omar Asaker Date: Tue, 8 Oct 2024 09:49:40 +0100 Subject: [PATCH] ci: add beetle security test to CI Add beetle security test job to templates. Include the job into deployment and daily pipelines. Signed-off-by: Mohamed Omar Asaker --- .gitlab/pipelines/daily-pipeline.yml | 6 ++++++ .gitlab/pipelines/deployment-pipeline.yml | 10 +++++++++ .gitlab/templates/beetle-security-test.yml | 25 ++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 .gitlab/templates/beetle-security-test.yml diff --git a/.gitlab/pipelines/daily-pipeline.yml b/.gitlab/pipelines/daily-pipeline.yml index c00b14d3a..0fb2971cc 100644 --- a/.gitlab/pipelines/daily-pipeline.yml +++ b/.gitlab/pipelines/daily-pipeline.yml @@ -10,6 +10,7 @@ stages: - static-analysis - unit-testing - build + - beetle-security-test - scmi-test - platform-test - coverage-report @@ -19,6 +20,7 @@ include: - local: .gitlab/templates/static-analysis.yml - local: .gitlab/templates/unit-test.yml - local: .gitlab/templates/build-test.yml + - local: .gitlab/templates/beetle-security-test.yml - local: .gitlab/templates/scmi-test.yml - local: .gitlab/templates/platform-test.yml - local: .gitlab/templates/merge-report.yml @@ -49,6 +51,10 @@ build-optee: stage: build allow_failure: true +beetle-security-test: + extends: .beetle-security-test + stage: beetle-security-test + scmi-test: extends: .scmi-test stage: scmi-test diff --git a/.gitlab/pipelines/deployment-pipeline.yml b/.gitlab/pipelines/deployment-pipeline.yml index 02ae57250..61475b6e3 100644 --- a/.gitlab/pipelines/deployment-pipeline.yml +++ b/.gitlab/pipelines/deployment-pipeline.yml @@ -11,6 +11,7 @@ stages: - static-analysis - unit-testing - build + - beetle-security-test - scmi-test - platform-test - coverage-report @@ -22,6 +23,7 @@ include: - local: .gitlab/templates/static-analysis.yml - local: .gitlab/templates/unit-test.yml - local: .gitlab/templates/build-test.yml + - local: .gitlab/templates/beetle-security-test.yml - local: .gitlab/templates/scmi-test.yml - local: .gitlab/templates/platform-test.yml - local: .gitlab/templates/merge-report.yml @@ -106,6 +108,14 @@ build-optee: dependencies: - pull-mr +beetle-security-test: + extends: + - .beetle-security-test + - .git-strategy-on-mr + stage: beetle-security-test + dependencies: + - pull-mr + scmi-test: extends: - .scmi-test diff --git a/.gitlab/templates/beetle-security-test.yml b/.gitlab/templates/beetle-security-test.yml new file mode 100644 index 000000000..e76932048 --- /dev/null +++ b/.gitlab/templates/beetle-security-test.yml @@ -0,0 +1,25 @@ +# +# Arm SCP/MCP Software +# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +.beetle-security-test: + image: ${CI_REGISTRY_IMAGE}/scp-tester-amd64 + tags: + - amd64 + variables: + GIT_SUBMODULE_STRATEGY: recursive + GIT_DEPTH: 1 + CODE_COVERAGE: "true" + parallel: + matrix: + - SCP_CI_PLATFORM: + - sgm776 + before_script: + - echo "PROJECT_TYPE = $PROJECT_TYPE" + - ln -s $(pwd) /$PROJECT_TYPE + script: + - echo "platform under test $SCP_CI_PLATFORM" + - /scp_tester_entrypoint.sh $PROJECT_TYPE beetle_security -- GitLab