summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2021-07-02 18:46:25 +0000
committerGerrit Code Review <gerrit@opnfv.org>2021-07-02 18:46:25 +0000
commitdc2aa77c3082b54b0dd9e376a0287b8224395315 (patch)
tree1211a05f47a530333ae653c3aa73b683d795bb6a
parent76d3a4640f0ed4317367b9fbc8f2228558cc752e (diff)
parent7ea1503eed9aeeabf0488066257b34bd56084ab5 (diff)
Merge "Fix: RTD Gitlab Triggers for Stable branch"
-rw-r--r--gitlab-templates/RTD.gitlab-ci.yml9
1 files changed, 7 insertions, 2 deletions
diff --git a/gitlab-templates/RTD.gitlab-ci.yml b/gitlab-templates/RTD.gitlab-ci.yml
index 198ed5bdc..59b455d69 100644
--- a/gitlab-templates/RTD.gitlab-ci.yml
+++ b/gitlab-templates/RTD.gitlab-ci.yml
@@ -27,6 +27,7 @@ variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
DOCS_DIRECTORY: "docs"
DOCS_REQUIREMENTS: "$DOCS_DIRECTORY/requirements.txt"
+ STABLE_BRANCH: "stable/*"
.docs-cache: &docs-cache
paths:
@@ -58,9 +59,11 @@ docs-build:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCS_SCHEDULE != "true"
when: never
- - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes:
- $DOCS_DIRECTORY/**/*
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_COMMIT_BRANCH == $STABLE_BRANCH
docs-link-check:
stage: test
@@ -78,9 +81,11 @@ docs-link-check:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCS_SCHEDULE != "true"
when: never
- - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes:
- $DOCS_DIRECTORY/**/*
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_COMMIT_BRANCH == $STABLE_BRANCH
pages:
stage: deploy