diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66a512a..4fc9d3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ generate-pipeline: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_BRANCH == "stage"' + - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/' trigger-downstream: stage: trigger @@ -43,3 +44,4 @@ trigger-downstream: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_BRANCH == "stage"' + - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/' diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh index 467f7bd..cbf6f7c 100755 --- a/scripts/generate-pipeline.sh +++ b/scripts/generate-pipeline.sh @@ -74,6 +74,7 @@ validate-${job_prefix}: rules: - if: '\$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '\$CI_COMMIT_BRANCH == "stage"' + - if: '\$CI_COMMIT_BRANCH =~ /^feature\\/.*/' - if: '\$CI_PIPELINE_SOURCE == "pipeline"' interruptible: true artifacts: @@ -115,6 +116,7 @@ plan-${job_prefix}: rules: - if: '\$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '\$CI_COMMIT_BRANCH == "stage"' + - if: '\$CI_COMMIT_BRANCH =~ /^feature\\/.*/' - if: '\$CI_PIPELINE_SOURCE == "pipeline"' interruptible: true artifacts: