From eefd330093442f0156f640af404de41aab539f36 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 4 Aug 2025 17:16:48 +0200 Subject: [PATCH 1/5] Revert "change order of stages" This reverts commit 5755c6041b5e0732af7608ee02af88081a62f03e. --- main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.yml b/main.yml index 81295f0..16d4c90 100644 --- a/main.yml +++ b/main.yml @@ -16,9 +16,9 @@ stages: - prevalidate - build # only in basop - - compare - # only in basop - check-be - test + # only in basop + - compare - postvalidate - deploy -- GitLab From 4a2803c9c09b614d299bd3c2f8d740f663f3eaf0 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 4 Aug 2025 17:20:12 +0200 Subject: [PATCH 2/5] have individual stages sections for the two repos --- main-basop.yml | 12 ++++++++++++ main.yml | 6 +----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/main-basop.yml b/main-basop.yml index b22af90..a4e65aa 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -1,6 +1,18 @@ include: - local: main.yml +stages: + - .pre + - prevalidate + - build + # only in basop + - check-be + - test + # only in basop + - compare + - postvalidate + - deploy + workflow: name: '$IVAS_PIPELINE_NAME' diff --git a/main.yml b/main.yml index 16d4c90..5715abf 100644 --- a/main.yml +++ b/main.yml @@ -8,17 +8,13 @@ default: # by default, we want all jobs to be interruptible, and we need to configure this explicitly interruptible: true -# we can define all stages centrally + # Note: currently only used for float stages: - .pre # only in float - maintenance - prevalidate - build - # only in basop - - check-be - test - # only in basop - - compare - postvalidate - deploy -- GitLab From bb4c63fc868c74906e821b4111b9f4066b621e42 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 4 Aug 2025 17:23:16 +0200 Subject: [PATCH 3/5] add missing stage --- main-basop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/main-basop.yml b/main-basop.yml index a4e65aa..df4b962 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -3,6 +3,7 @@ include: stages: - .pre + - maintenance - prevalidate - build # only in basop -- GitLab From b9c929f39dbca02db436c589176c6bd87939eaa9 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 4 Aug 2025 17:24:46 +0200 Subject: [PATCH 4/5] stage reordering for BASOP + cleanup --- main-basop.yml | 4 ++-- main.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main-basop.yml b/main-basop.yml index df4b962..94a0395 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -7,10 +7,10 @@ stages: - prevalidate - build # only in basop + - compare + # only in basop - check-be - test - # only in basop - - compare - postvalidate - deploy diff --git a/main.yml b/main.yml index 5715abf..fe675ef 100644 --- a/main.yml +++ b/main.yml @@ -11,7 +11,6 @@ default: # Note: currently only used for float stages: - .pre - # only in float - maintenance - prevalidate - build -- GitLab From 6d4bb81644e9ffc0a0260c4ea0c2af3d838f9ca6 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 4 Aug 2025 17:27:45 +0200 Subject: [PATCH 5/5] add compare stage back --- main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/main.yml b/main.yml index fe675ef..df75d2c 100644 --- a/main.yml +++ b/main.yml @@ -15,5 +15,6 @@ stages: - prevalidate - build - test + - compare - postvalidate - deploy -- GitLab