From c644b54f602114940d67b0e9f8e0f38bda860f69 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 13 Jul 2023 22:39:03 +0200 Subject: [PATCH 1/6] add job to upload selection-BE-test result --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69e55c89d7..ba233dfc03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1310,6 +1310,21 @@ complexity-StereoDmxEVS-stereo-in-mono-out: # Other jobs # --------------------------------------------------------------- +upload-selection-BE-log: + rules: + - if: $UPLOAD_SELECTION_BE_RESULTS && $CI_PIPELINE_SOURCE == 'trigger' + when: always + timeout: 5 minutes + tags: + - ericsson-windows-runner + script: + - cp -r $SELECTION_BE_RESULT ./selection-BE-result + artifacts: + paths: + - selection-BE-result/public_log--sha-*.txt + when: always + expire_in: 1 week + # job that sets up gitlab pages website pages: stage: deploy -- GitLab From 19042ac0eaa17df7447993196eb810d869fab919 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 13 Jul 2023 22:49:55 +0200 Subject: [PATCH 2/6] add trigger pipeline to workflow --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba233dfc03..afcdee03a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main - if: $CI_PIPELINE_SOURCE == 'web' # for testing + - if: $CI_PIPELINE_SOURCE == 'trigger' stages: - .pre -- GitLab From 8adf644f8c5a208c918b4f2851f6098f921e9d60 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Fri, 14 Jul 2023 00:17:30 +0200 Subject: [PATCH 3/6] Don't run triggered pipeline by default --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afcdee03a2..734c0925bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,6 +137,8 @@ stages: - if: $CI_PIPELINE_SOURCE == 'schedule' # Don't run in any scheduled pipelines by default (use schedule templates below to enable again for certain conditions) when: never - when: on_success + - if: $CI_PIPELINE_SOURCE == 'trigger' # Don't run triggered pipeline by default + when: never .rules-merge-request: extends: .rules-basis -- GitLab From 6c1d604fb09a7ecc0756fd3be72ba1439d85d55d Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Fri, 14 Jul 2023 10:09:16 +0200 Subject: [PATCH 4/6] skip build jobs for triggered pipeline --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 734c0925bc..255dc6c90a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,9 +136,9 @@ stages: when: never - if: $CI_PIPELINE_SOURCE == 'schedule' # Don't run in any scheduled pipelines by default (use schedule templates below to enable again for certain conditions) when: never - - when: on_success - if: $CI_PIPELINE_SOURCE == 'trigger' # Don't run triggered pipeline by default when: never + - when: on_success .rules-merge-request: extends: .rules-basis -- GitLab From 40f5952a96b6afd3d438b706802d5b3f3e75f839 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Fri, 14 Jul 2023 14:29:57 +0200 Subject: [PATCH 5/6] display log content --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 255dc6c90a..c04e5359bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1322,6 +1322,7 @@ upload-selection-BE-log: - ericsson-windows-runner script: - cp -r $SELECTION_BE_RESULT ./selection-BE-result + - Get-Content -Path selection-BE-result/public_log--sha-*.txt artifacts: paths: - selection-BE-result/public_log--sha-*.txt -- GitLab From 14fbca632728cdede852e3996a2643c2a3a99fcb Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Tue, 18 Jul 2023 08:33:45 +0200 Subject: [PATCH 6/6] set exit value based on test success - fail job if selection-BE test failed --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c04e5359bf..5c5931cfee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1323,6 +1323,8 @@ upload-selection-BE-log: script: - cp -r $SELECTION_BE_RESULT ./selection-BE-result - Get-Content -Path selection-BE-result/public_log--sha-*.txt + - $has_failed = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line + - If($has_failed) {exit -1} artifacts: paths: - selection-BE-result/public_log--sha-*.txt -- GitLab