From c74de844091a8c44da10302021899293c014fc99 Mon Sep 17 00:00:00 2001 From: Tim DE WINTER Date: Tue, 9 Jul 2024 15:21:06 +0200 Subject: [PATCH 1/7] fix(ci): disable double manual action for e2e-tests --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc4d8b74ae..b5a219aa21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -292,10 +292,6 @@ test:e2e:pw: extends: - .tests-node image: mcr.microsoft.com/playwright:${PLAYWRIGHT_VERSION} - rules: - - if: *if-merge-request - when: manual - - when: never allow_failure: true needs: ["test:e2e"] variables: From efc8f2e9ec248bb52649b71058f0cb8afa25e572 Mon Sep 17 00:00:00 2001 From: Tim DE WINTER Date: Tue, 9 Jul 2024 15:20:31 +0200 Subject: [PATCH 2/7] fix(ci): trigger unit-test on merge request commits Changelog: fixed --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5a219aa21..4b3456e890 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ variables: when: on_success # Staging deployments on Merge Requests -.rule-staging: &rule-staging +.rule-merge-request: &rule-merge-request - if: &if-merge-request "$CI_MERGE_REQUEST_ID" when: on_success @@ -115,7 +115,7 @@ variables: - shared rules: - *rule-not-scheduled # Job is not triggered by schedule - - *rule-staging + - *rule-merge-request - *rule-prodsec - when: never environment: @@ -164,7 +164,7 @@ build:front: - *rule-preprod - *rule-canary - *rule-prod - - *rule-staging + - *rule-merge-request - when: never environment: name: "$ENVIRONMENT_NAME" @@ -248,6 +248,7 @@ test:unit: - .tests-node rules: - *rule-commit + - *rule-merge-request - when: never script: - yarn test:webapp @@ -323,7 +324,7 @@ release:front: - *rule-preprod - *rule-canary - *rule-prod - - *rule-staging + - *rule-merge-request - when: never environment: name: "$ENVIRONMENT_NAME" From a1374068e5164f93e6353dc9a2ab25c0f22cf8d6 Mon Sep 17 00:00:00 2001 From: "anton.buksa" Date: Tue, 9 Jul 2024 15:43:17 +0200 Subject: [PATCH 3/7] split test steps for coverage reports to work Changelog: chore --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b3456e890..3f6fe47761 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build - - test + - test-unit + - test-e2e - release - deploy @@ -234,7 +235,7 @@ build:image: # Execute tsc # test:tsc: -# stage: test +# stage: test-unit # extends: # - .tests # allow_failure: true @@ -243,7 +244,7 @@ build:image: # Execute unit tests test:unit: - stage: test + stage: test-unit extends: - .tests-node rules: @@ -271,7 +272,7 @@ test:unit: # Triggers e2e tests # Parse staging base URL and store in dotenv artifact test:e2e: - stage: test + stage: test-e2e extends: - .tests image: ruby:${RUBY_VERSION} @@ -289,7 +290,7 @@ test:e2e: # Execute playwright tests test:e2e:pw: - stage: test + stage: test-e2e extends: - .tests-node image: mcr.microsoft.com/playwright:${PLAYWRIGHT_VERSION} From f6433e09a5d2592d71967cb03b8f35e76a99720f Mon Sep 17 00:00:00 2001 From: "anton.buksa" Date: Tue, 9 Jul 2024 15:51:14 +0200 Subject: [PATCH 4/7] test change stage case --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f6fe47761..f508ca86a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - build - - test-unit - - test-e2e + - test_unit + - test_e2e - release - deploy @@ -235,7 +235,7 @@ build:image: # Execute tsc # test:tsc: -# stage: test-unit +# stage: test_unit # extends: # - .tests # allow_failure: true @@ -244,7 +244,7 @@ build:image: # Execute unit tests test:unit: - stage: test-unit + stage: test_unit extends: - .tests-node rules: @@ -272,7 +272,7 @@ test:unit: # Triggers e2e tests # Parse staging base URL and store in dotenv artifact test:e2e: - stage: test-e2e + stage: test_e2e extends: - .tests image: ruby:${RUBY_VERSION} @@ -290,7 +290,7 @@ test:e2e: # Execute playwright tests test:e2e:pw: - stage: test-e2e + stage: test_e2e extends: - .tests-node image: mcr.microsoft.com/playwright:${PLAYWRIGHT_VERSION} From e8ecfd3e9d78015cd9be304711a10087de0a4e6b Mon Sep 17 00:00:00 2001 From: "anton.buksa" Date: Tue, 9 Jul 2024 15:52:22 +0200 Subject: [PATCH 5/7] disable triage --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f508ca86a8..36788a611e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,13 +5,13 @@ stages: - release - deploy -include: +# include: # - template: Security/SAST.gitlab-ci.yml # - template: Security/Container-Scanning.gitlab-ci.yml # - template: Code-Quality.gitlab-ci.yml - - project: "docker-public/gitlab-triage" - ref: master - file: "/gitlab-triage.yaml" + # - project: "docker-public/gitlab-triage" + # ref: master + # file: "/gitlab-triage.yaml" variables: KANIKO_VERSION: "debug" # https://github.com/GoogleContainerTools/kaniko/releases From 77b945ceb6966b7289ecef7c1bb6d21dfde40045 Mon Sep 17 00:00:00 2001 From: "anton.buksa" Date: Tue, 9 Jul 2024 15:52:59 +0200 Subject: [PATCH 6/7] disable triage --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36788a611e..79ab40a8bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -429,13 +429,13 @@ guild_review: script: - ruby .gitlab/mr_review.rb -gitlab_triage: - rules: - - if: "$GITLAB_TRIAGE" - when: on_success - - when: never - variables: - TRIAGE_POLICY_FILE: .gitlab/triage-policies.yml +# gitlab_triage: +# rules: +# - if: "$GITLAB_TRIAGE" +# when: on_success +# - when: never +# variables: +# TRIAGE_POLICY_FILE: .gitlab/triage-policies.yml technical_debt: extends: gitlab_triage From dd5f29896eaf86bbb0567a55ac10dc942beb9293 Mon Sep 17 00:00:00 2001 From: "anton.buksa" Date: Tue, 9 Jul 2024 15:53:47 +0200 Subject: [PATCH 7/7] disable triage --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79ab40a8bf..bd77cf66b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -420,14 +420,14 @@ release:sentry: - sentry-cli releases finalize ${CI_COMMIT_TAG} # HOUSE KEEPING -guild_review: - image: ruby:${RUBY_VERSION} - rules: - - if: "$MR_REVIEW_SCHEDULE" - when: on_success - - when: never - script: - - ruby .gitlab/mr_review.rb +# guild_review: +# image: ruby:${RUBY_VERSION} +# rules: +# - if: "$MR_REVIEW_SCHEDULE" +# when: on_success +# - when: never +# script: +# - ruby .gitlab/mr_review.rb # gitlab_triage: # rules: @@ -437,11 +437,11 @@ guild_review: # variables: # TRIAGE_POLICY_FILE: .gitlab/triage-policies.yml -technical_debt: - extends: gitlab_triage - rules: - - if: "$TRIAGE_TECHNICAL_DEBT" - when: on_success - - when: never - variables: - TRIAGE_POLICY_FILE: .gitlab/summaries-technical-debt.yml +# technical_debt: +# extends: gitlab_triage +# rules: +# - if: "$TRIAGE_TECHNICAL_DEBT" +# when: on_success +# - when: never +# variables: +# TRIAGE_POLICY_FILE: .gitlab/summaries-technical-debt.yml