From 40fe819b588d3f604851469ac85f3ad6d385153b Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Wed, 2 Dec 2020 12:42:34 +0500 Subject: [PATCH 1/5] Only enable changes and positive case --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 301e95a4..ccd474a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,14 +88,14 @@ rspec: # Don't run E2E jobs on release pipelines - changes: ["lib/**/version.rb"] when: never - - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/' - when: never - - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' - when: manual - - if: '$RELEASE =~ /gitlab-ce/ && $CI_JOB_NAME =~ /quarantine|custom/' - when: manual - - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' - when: manual +# - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/' +# when: never +# - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' +# when: manual +# - if: '$RELEASE =~ /gitlab-ce/ && $CI_JOB_NAME =~ /quarantine|custom/' +# when: manual +# - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' +# when: manual - if: '$RELEASE == null || $RELEASE =~ /gitlab-ce/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"' .ee-qa: @@ -105,14 +105,14 @@ rspec: # Don't run E2E jobs on release pipelines - changes: ["lib/**/version.rb"] when: never - - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/' - when: never - - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' - when: manual - - if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/' - when: manual - - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' - when: manual +# - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/' +# when: never +# - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' +# when: manual +# - if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/' +# when: manual +# - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' +# when: manual - if: '$RELEASE == null || $RELEASE =~ /gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"' .only-qa: -- GitLab From 3f210c896b3e38ae7a0bcb7f51950e032c931938 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Wed, 2 Dec 2020 12:43:55 +0500 Subject: [PATCH 2/5] Enable rule to filter gitlab-ce or gitlab-ee --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccd474a9..18edb156 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,10 +86,10 @@ rspec: DEFAULT_RELEASE: "CE" rules: # Don't run E2E jobs on release pipelines - - changes: ["lib/**/version.rb"] - when: never -# - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/' +# - changes: ["lib/**/version.rb"] # when: never + - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/' + when: never # - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' # when: manual # - if: '$RELEASE =~ /gitlab-ce/ && $CI_JOB_NAME =~ /quarantine|custom/' @@ -103,10 +103,10 @@ rspec: DEFAULT_RELEASE: "EE" rules: # Don't run E2E jobs on release pipelines - - changes: ["lib/**/version.rb"] - when: never -# - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/' +# - changes: ["lib/**/version.rb"] # when: never + - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/' + when: never # - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' # when: manual # - if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/' -- GitLab From 2ab0aea4324f6d96a5dd72671b78aa68aa69d971 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Wed, 2 Dec 2020 14:55:31 +0500 Subject: [PATCH 3/5] Only disable version change detection rule --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18edb156..5fb1129c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,12 +90,12 @@ rspec: # when: never - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/' when: never -# - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' -# when: manual -# - if: '$RELEASE =~ /gitlab-ce/ && $CI_JOB_NAME =~ /quarantine|custom/' -# when: manual -# - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' -# when: manual + - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' + when: manual + - if: '$RELEASE =~ /gitlab-ce/ && $CI_JOB_NAME =~ /quarantine|custom/' + when: manual + - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' + when: manual - if: '$RELEASE == null || $RELEASE =~ /gitlab-ce/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"' .ee-qa: @@ -107,12 +107,12 @@ rspec: # when: never - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/' when: never -# - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' -# when: manual -# - if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/' -# when: manual -# - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' -# when: manual + - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' + when: manual + - if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/' + when: manual + - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/' + when: manual - if: '$RELEASE == null || $RELEASE =~ /gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"' .only-qa: -- GitLab From dc4ea5c03e18d4c6bc7c35410027c9c7ff0392f7 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Wed, 2 Dec 2020 14:58:01 +0500 Subject: [PATCH 4/5] Enable version change detection --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fb1129c..301e95a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,8 +86,8 @@ rspec: DEFAULT_RELEASE: "CE" rules: # Don't run E2E jobs on release pipelines -# - changes: ["lib/**/version.rb"] -# when: never + - changes: ["lib/**/version.rb"] + when: never - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/' when: never - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' @@ -103,8 +103,8 @@ rspec: DEFAULT_RELEASE: "EE" rules: # Don't run E2E jobs on release pipelines -# - changes: ["lib/**/version.rb"] -# when: never + - changes: ["lib/**/version.rb"] + when: never - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/' when: never - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/' -- GitLab From b385ff010e398d0de82f4a591459623aea4a1545 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Wed, 2 Dec 2020 14:58:59 +0500 Subject: [PATCH 5/5] temporary change --- LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index 4abe8b8b..10414b94 100644 --- a/LICENSE +++ b/LICENSE @@ -23,3 +23,5 @@ THE SOFTWARE. For all third party components incorporated into the GitLab Software, those components are licensed under the original license provided by the owner of the applicable component. + +Temporary change -- GitLab