From 9991b34207f4b974ded930a7dd53d4c02c29317e Mon Sep 17 00:00:00 2001
From: Leandro Belli <leandro.belli@arm.com>
Date: Fri, 27 Dec 2024 17:08:51 +0000
Subject: [PATCH] ci: refactor the daily and deployment pipelines stages

Changes introduced:

- Renamed the `linting` stage to `code-quality`.
- Grouped `beetle-security-test`, `scmi-test`, and
  `platform-test` under `integration-test`.

Signed-off-by: Leandro Belli <leandro.belli@arm.com>
---
 .gitlab/pipelines/daily-pipeline.yml      | 20 ++++++++---------
 .gitlab/pipelines/deployment-pipeline.yml | 27 ++++++++++-------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/.gitlab/pipelines/daily-pipeline.yml b/.gitlab/pipelines/daily-pipeline.yml
index 12ac64cda..7a6b79829 100644
--- a/.gitlab/pipelines/daily-pipeline.yml
+++ b/.gitlab/pipelines/daily-pipeline.yml
@@ -6,13 +6,11 @@
 #
 
 stages:
-  - linting
+  - code-quality
   - static-analysis
   - unit-testing
   - build
-  - beetle-security-test
-  - scmi-test
-  - platform-test
+  - integration-test
   - coverage-report
 
 include:
@@ -37,12 +35,12 @@ notify-failure:
 
 check-lint:
   extends: .check-lint
-  stage: linting
+  stage: code-quality
   allow_failure: true
 
 banned-api:
   extends: .banned-api
-  stage: static-analysis
+  stage: code-quality
   allow_failure: true
 
 check-ut:
@@ -62,23 +60,23 @@ build-optee:
 
 beetle-security-test:
   extends: .beetle-security-test
-  stage: beetle-security-test
+  stage: integration-test
 
 scmi-test:
   extends: .scmi-test
-  stage: scmi-test
+  stage: integration-test
 
 fvp-boot-test:
   extends: .fvp-boot-test
-  stage: platform-test
+  stage: integration-test
 
 board-test-build:
   extends: .board-test-build
-  stage: platform-test
+  stage: integration-test
 
 board-test-run:
   extends: .board-test-run
-  stage: platform-test
+  stage: integration-test
   needs:
     - board-test-build
 
diff --git a/.gitlab/pipelines/deployment-pipeline.yml b/.gitlab/pipelines/deployment-pipeline.yml
index 8cc3bf6f8..9ad0009e4 100644
--- a/.gitlab/pipelines/deployment-pipeline.yml
+++ b/.gitlab/pipelines/deployment-pipeline.yml
@@ -6,14 +6,11 @@
 #
 
 stages:
-  - test-workspace
-  - linting
+  - code-quality
   - static-analysis
   - unit-testing
   - build
-  - beetle-security-test
-  - scmi-test
-  - platform-test
+  - integration-test
   - coverage-report
 
 include:
@@ -56,7 +53,7 @@ check-lint:
   extends:
     - .check-lint
     - .git-strategy-on-mr
-  stage: linting
+  stage: code-quality
   dependencies:
     - pull-mr
 
@@ -64,7 +61,7 @@ check-copyright:
   extends:
     - .check-copyright
     - .git-strategy-on-mr
-  stage: linting
+  stage: code-quality
   dependencies:
     - pull-mr
 
@@ -72,7 +69,7 @@ check-style:
   extends:
     - .check-style
     - .git-strategy-on-mr
-  stage: linting
+  stage: code-quality
   dependencies:
     - pull-mr
 
@@ -80,7 +77,7 @@ check-for-merge-commits:
   extends:
     - .check-for-merge-commits
     - .git-strategy-on-mr
-  stage: linting
+  stage: code-quality
   dependencies:
     - pull-mr
 
@@ -88,7 +85,7 @@ banned-api:
   extends:
     - .banned-api
     - .git-strategy-on-mr
-  stage: static-analysis
+  stage: code-quality
   dependencies:
     - pull-mr
 
@@ -120,7 +117,7 @@ beetle-security-test:
   extends:
     - .beetle-security-test
     - .git-strategy-on-mr
-  stage: beetle-security-test
+  stage: integration-test
   dependencies:
     - pull-mr
 
@@ -128,7 +125,7 @@ scmi-test:
   extends:
     - .scmi-test
     - .git-strategy-on-mr
-  stage: scmi-test
+  stage: integration-test
   dependencies:
     - pull-mr
 
@@ -137,21 +134,21 @@ fvp-boot-test:
     - .fvp-boot-test
     - .git-strategy-on-mr
     - .auto_on_public_mr_only
-  stage: platform-test
+  stage: integration-test
 
 board-test-build:
   extends:
     - .board-test-build
     - .git-strategy-on-mr
     - .auto_on_public_mr_only
-  stage: platform-test
+  stage: integration-test
 
 board-test-run:
   extends:
     - .board-test-run
     - .git-strategy-on-mr
     - .auto_on_public_mr_only
-  stage: platform-test
+  stage: integration-test
   needs:
     - board-test-build
 
-- 
GitLab