Merge "Protect if {volumes} or env is None"

diff --git a/gitlab-templates/RTD.gitlab-ci.yml b/gitlab-templates/RTD.gitlab-ci.yml
index 5b838d2..198ed5b 100644 (file)
--- a/gitlab-templates/RTD.gitlab-ci.yml
+++ b/gitlab-templates/RTD.gitlab-ci.yml
@@ -19,10 +19,14 @@
 #
 # Scheduled builds can be enabled when creating a schedule job and
 # specifying DOCS_SCHEDULE = "true" in build variables
+#
+# If extra dependencies are needed for builds they will be installed
+# from the $DOCS_REQUIREMENTS location.
 ---
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   DOCS_DIRECTORY: "docs"
+  DOCS_REQUIREMENTS: "$DOCS_DIRECTORY/requirements.txt"
 
 .docs-cache: &docs-cache
   paths:
@@ -36,8 +40,8 @@ variables:
   - source venv/bin/activate
   - pip install Sphinx
   - |
-    if [ -f "$DOCS_DIRECTORY/requirements.txt" ]; then
-      pip install -r "$DOCS_DIRECTORY/requirements.txt"
+    if [ -f "$DOCS_REQUIREMENTS" ]; then
+      pip install -r "$DOCS_REQUIREMENTS"
     fi
 
 docs-build:
@@ -56,7 +60,7 @@ docs-build:
       when: never
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - $DOCS_DIRECTORY/*
+        - $DOCS_DIRECTORY/**/*
 
 docs-link-check:
   stage: test
@@ -76,7 +80,7 @@ docs-link-check:
       when: never
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - $DOCS_DIRECTORY/*
+        - $DOCS_DIRECTORY/**/*
 
 pages:
   stage: deploy
@@ -92,4 +96,4 @@ pages:
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - $DOCS_DIRECTORY/*
+        - $DOCS_DIRECTORY/**/*

diff --git a/releases/kali/airship.yaml b/releases/kali/airship.yaml
new file mode 100644 (file)
index 0000000..6eb5f6f
--- /dev/null
+++ b/releases/kali/airship.yaml
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: airship
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/kali
+    location:
+      airship: 88723e1bb827b0efa57f47cb12d0ff1c1fe7802c
+
+release-notes: http://docs.opnfv.org/en/stable-kali/submodules/airship/docs/release/release-notes/release-notes.html

diff --git a/releases/kali/barometer.yaml b/releases/kali/barometer.yaml
new file mode 100644 (file)
index 0000000..a916ce1
--- /dev/null
+++ b/releases/kali/barometer.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2021 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: barometer
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/kali
+    location:
+      barometer: 08fd79b551dde788da6974705df9c9d3e8de01d5

diff --git a/releases/kali/kuberef.yaml b/releases/kali/kuberef.yaml
new file mode 100644 (file)
index 0000000..e4c826e
--- /dev/null
+++ b/releases/kali/kuberef.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: kuberef
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/kali
+    location:
+      kuberef: e917625c424d33e892fa253cdd02da926b843325