Merge branch 'concurrent-work' into 'development'

feat: work as part of other projects

See merge request nofusscomputing/projects/gitlab-ci!33

.gitlab-ci.yml

@@ -67,8 +67,8 @@ gemnasium-python-dependency_scanning:
     - if: $CI_COMMIT_BRANCH &&
           $GITLAB_FEATURES =~ /\bdependency_scanning\b/ &&
           $DS_DEFAULT_ANALYZERS =~ /gemnasium-python/ &&
-          $PIP_REQUIREMENTS_FILE &&
+          $PIP_REQUIREMENTS_FILE && 
-          $CI_PIPELINE_SOURCE == "push"
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")
 
 Ansible Dependencies:
   extends: .gemnasium-python-dependency_scanning

automation/.gitlab-ci-ansible.yaml

@@ -12,6 +12,7 @@ include:
     ansible_inventory: ''
     ansible_playbook: ''
     ansible_tags: ''
+    ANSIBLE_FORCE_COLOR: 'true'
   script:
     - if [ "0$ansible_inventory" != '0' ]; then ansible_inventory=-i $ansible_inventory; fi
     - if [ "0$ansible_tags" != '0' ]; then ansible_tags=$(echo -n "--tags $ansible_tags"); fi

conventional_commits/.gitlab-ci.yml

@@ -52,11 +52,13 @@
       when: never
     - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
       when: never
-    - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH == "master" &&
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
       - .cz.yaml
       when: always
-    - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH &&
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
       - .cz.yaml
       when: always

docker/build.gitlab-ci.yaml

@@ -103,12 +103,14 @@ variables:
         - dockerfile
         - dockerfile.j2
       when: on_success
-    - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH == "development" && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - dockerfile
         - dockerfile.j2
       when: on_success
-    - if: '$CI_COMMIT_BRANCH != "master" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH != "master" && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - dockerfile
         - dockerfile.j2

docker/publish.gitlab-ci.yaml

@@ -101,12 +101,14 @@
         - dockerfile
         - dockerfile.j2
       when: on_success
-    - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH == "development" && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - dockerfile
         - dockerfile.j2
       when: on_success
-    - if: '$CI_COMMIT_BRANCH != "master" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH != "master" &&  
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - dockerfile
         - dockerfile.j2

git_push_mirror/.gitlab-ci.yml

@@ -19,8 +19,10 @@
           when: never
         - if: '$CI_COMMIT_TAG && $GIT_SYNC_URL != null'
           when: always
-        - if: '$CI_COMMIT_BRANCH == "master" && $GIT_SYNC_URL != null && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH == "master" && $GIT_SYNC_URL != null &&
-        - if: '$CI_COMMIT_BRANCH == "development" && $GIT_SYNC_URL != null && $CI_PIPELINE_SOURCE == "push"'
+              ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
+        - if: '$CI_COMMIT_BRANCH == "development" && $GIT_SYNC_URL != null &&
+              ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           when: always
         - when: never
 

gitlab_release/.gitlab-ci.yml

@@ -52,10 +52,12 @@
           when: never
         - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
           when: never
-        - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH == "master" &&
+             ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           when: on_success
           allow_failure: false
-        - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH == "development" &&
+              ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           when: manual
           allow_failure: true
         # for testing
@@ -100,7 +102,8 @@ commit footer refs:
           when: never
         - if: '$CI_COMMIT_BRANCH == "development" || $CI_COMMIT_BRANCH == "master"'
           when: never
-        - if: '$CI_COMMIT_BRANCH && $CHANGELOG_FOOTER_REFERENCES != "False" && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH && $CHANGELOG_FOOTER_REFERENCES != "False" && 
+              ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           exists:
           - .cz.yaml
           when: always

lint/ansible.gitlab-ci.yaml

@@ -37,7 +37,8 @@
       when: never
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH == "master" &&
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       when: always
     - if: '$CI_COMMIT_TAG'
       when: always

lint/markdown.gitlab-ci.yaml

@@ -29,7 +29,8 @@
       junit:
         - "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/lint_markdown/*.junit.xml"
   rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - "**.md"
         - "**/**.md"
@@ -48,7 +49,8 @@
       exists:
         - "docs/index.md"
       when: always
-    - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - "docs/index.md"
       when: always

lint/yaml.gitlab-ci.yaml

@@ -40,8 +40,10 @@
           when: never
         - if: '$CI_COMMIT_TAG'
           when: always
-        - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH == "master" &&
+              ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           when: always
-        - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH &&
+            ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           when: always
         - when: never

mkdocs/.gitlab-ci.yml

@@ -29,7 +29,8 @@
       when: never
     - if: $CI_COMMIT_TAG
       when: on_success
-    - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - "mkdocs.yaml"
         - "mkdocs.yml"

python/.gitlab-ci.yml

@@ -46,7 +46,8 @@
         reports:
             codequality: "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/gl-code-quality-report.json"
     rules:
-        - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+        - if: '$CI_COMMIT_BRANCH &&
+              ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
           when: always
         - when: never
 

template/website.gitlab-ci.yaml

@@ -39,12 +39,14 @@ pages:
       when: never
     - if: $CI_COMMIT_TAG
       when: never
-    - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH == "development" && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - "mkdocs.yaml"
         - "mkdocs.yml"
       when: always
-    - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "master" && $CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "master" && 
+          ( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
       exists:
         - "mkdocs.yaml"
         - "mkdocs.yml"