From ac04ae66ceeb2333699282c5f81779d77aafe639 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Thu, 23 Feb 2023 13:56:15 +0100 Subject: [PATCH 1/3] Retry CI needs with coverage. --- .gitlab-ci.yml | 5 +++++ tests/tests_regression/DDR3/ci.yml | 2 ++ tests/tests_regression/DDR4/ci.yml | 2 ++ tests/tests_regression/HBM2/ci.yml | 4 +++- tests/tests_regression/LPDDR4/ci.yml | 2 ++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b795a3d8..738bb458 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,11 @@ build: coverage: stage: coverage + needs: + - test_DDR3 + - test_DDR4 + - test_HBM2 + - test_LPDDR4 coverage: '/Total:\|(\d+\.?\d+\%)/' script: # delete all empty files since they produce errors diff --git a/tests/tests_regression/DDR3/ci.yml b/tests/tests_regression/DDR3/ci.yml index ccac02f9..e3114b9e 100644 --- a/tests/tests_regression/DDR3/ci.yml +++ b/tests/tests_regression/DDR3/ci.yml @@ -1,6 +1,8 @@ # DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp example_DDR3: stage: test_DDR3 + needs: + - build script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') diff --git a/tests/tests_regression/DDR4/ci.yml b/tests/tests_regression/DDR4/ci.yml index 0709b007..4c1734f5 100644 --- a/tests/tests_regression/DDR4/ci.yml +++ b/tests/tests_regression/DDR4/ci.yml @@ -1,6 +1,8 @@ # DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler: example_DDR4: stage: test_DDR4 + needs: + - build script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') diff --git a/tests/tests_regression/HBM2/ci.yml b/tests/tests_regression/HBM2/ci.yml index 64510208..0e0c272b 100644 --- a/tests/tests_regression/HBM2/ci.yml +++ b/tests/tests_regression/HBM2/ci.yml @@ -1,5 +1,7 @@ -example_HBM2: +example_HBM2: stage: test_HBM2 + needs: + - build script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') diff --git a/tests/tests_regression/LPDDR4/ci.yml b/tests/tests_regression/LPDDR4/ci.yml index 2553aea4..bca187a4 100644 --- a/tests/tests_regression/LPDDR4/ci.yml +++ b/tests/tests_regression/LPDDR4/ci.yml @@ -1,6 +1,8 @@ # LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler: example_LPDDR4: stage: test_LPDDR4 + needs: + - build script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') From 56b404b29116c79c6eba0a50d900c0f170c20894 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Thu, 23 Feb 2023 13:59:35 +0100 Subject: [PATCH 2/3] Fix job name for needs. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 738bb458..3cc4d043 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,10 +36,10 @@ build: coverage: stage: coverage needs: - - test_DDR3 - - test_DDR4 - - test_HBM2 - - test_LPDDR4 + - example_DDR3 + - example_DDR4 + - example_HBM2 + - example_LPDDR4 coverage: '/Total:\|(\d+\.?\d+\%)/' script: # delete all empty files since they produce errors From 39b456d837b8d1d9a79557d2dbb982cded63399f Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Thu, 23 Feb 2023 14:09:16 +0100 Subject: [PATCH 3/3] Use one stage for all tests. --- .gitlab-ci.yml | 13 +++++-------- tests/tests_regression/DDR3/ci.yml | 4 ++-- tests/tests_regression/DDR4/ci.yml | 4 ++-- tests/tests_regression/HBM2/ci.yml | 4 ++-- tests/tests_regression/LPDDR4/ci.yml | 4 ++-- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cc4d043..39238ae7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,10 +7,7 @@ before_script: stages: - build - - test_DDR3 - - test_DDR4 - - test_HBM2 - - test_LPDDR4 + - test - coverage build: @@ -36,10 +33,10 @@ build: coverage: stage: coverage needs: - - example_DDR3 - - example_DDR4 - - example_HBM2 - - example_LPDDR4 + - test_DDR3 + - test_DDR4 + - test_HBM2 + - test_LPDDR4 coverage: '/Total:\|(\d+\.?\d+\%)/' script: # delete all empty files since they produce errors diff --git a/tests/tests_regression/DDR3/ci.yml b/tests/tests_regression/DDR3/ci.yml index e3114b9e..c4caafd2 100644 --- a/tests/tests_regression/DDR3/ci.yml +++ b/tests/tests_regression/DDR3/ci.yml @@ -1,6 +1,6 @@ # DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp -example_DDR3: - stage: test_DDR3 +test_DDR3: + stage: test needs: - build script: diff --git a/tests/tests_regression/DDR4/ci.yml b/tests/tests_regression/DDR4/ci.yml index 4c1734f5..12f6efaa 100644 --- a/tests/tests_regression/DDR4/ci.yml +++ b/tests/tests_regression/DDR4/ci.yml @@ -1,6 +1,6 @@ # DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler: -example_DDR4: - stage: test_DDR4 +test_DDR4: + stage: test needs: - build script: diff --git a/tests/tests_regression/HBM2/ci.yml b/tests/tests_regression/HBM2/ci.yml index 0e0c272b..4e64ebb0 100644 --- a/tests/tests_regression/HBM2/ci.yml +++ b/tests/tests_regression/HBM2/ci.yml @@ -1,5 +1,5 @@ -example_HBM2: - stage: test_HBM2 +test_HBM2: + stage: test needs: - build script: diff --git a/tests/tests_regression/LPDDR4/ci.yml b/tests/tests_regression/LPDDR4/ci.yml index bca187a4..1ffe6458 100644 --- a/tests/tests_regression/LPDDR4/ci.yml +++ b/tests/tests_regression/LPDDR4/ci.yml @@ -1,6 +1,6 @@ # LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler: -example_LPDDR4: - stage: test_LPDDR4 +test_LPDDR4: + stage: test needs: - build script: