Skip to content
Snippets Groups Projects
Commit 395d25df authored by Jon Azpiazu's avatar Jon Azpiazu
Browse files

Merge branch 'master' of git.code.tecnalia.com:tecnalia_robotics-public/gitlab_templates

parents e61098a2 68a07ac4
No related branches found
No related tags found
No related merge requests found
Pipeline #162862 passed
include: ci-templates/auto-rules/no-default.yml
variables:
DEFAULT_DISTRO: jazzy
...@@ -14,6 +14,9 @@ workflow: ...@@ -14,6 +14,9 @@ workflow:
- if: $CI_COMMIT_REF_NAME =~ /^humble-.*/ - if: $CI_COMMIT_REF_NAME =~ /^humble-.*/
variables: variables:
DEFAULT_DISTRO: "humble" DEFAULT_DISTRO: "humble"
- if: $CI_COMMIT_REF_NAME =~ /^jazzy-.*/
variables:
DEFAULT_DISTRO: "jazzy"
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
...@@ -49,6 +52,14 @@ industrial_ci_humble: ...@@ -49,6 +52,14 @@ industrial_ci_humble:
- if: $DEFAULT_DISTRO == "humble" - if: $DEFAULT_DISTRO == "humble"
- if: $BUILD_HUMBLE - if: $BUILD_HUMBLE
industrial_ci_jazzy:
extends: .industrial_ci
variables:
ROS_DISTRO: jazzy
rules:
- if: $DEFAULT_DISTRO == "jazzy"
- if: $BUILD_JAZZY
.py3_rules: .py3_rules:
rules: rules:
- if: $DEFAULT_DISTRO == "noetic" - if: $DEFAULT_DISTRO == "noetic"
...@@ -59,6 +70,10 @@ industrial_ci_humble: ...@@ -59,6 +70,10 @@ industrial_ci_humble:
when: always when: always
- if: $BUILD_HUMBLE - if: $BUILD_HUMBLE
when: always when: always
- if: $DEFAULT_DISTRO == "jazzy"
when: always
- if: $BUILD_JAZZY
when: always
py3-flake8: py3-flake8:
extends: extends:
......
include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
DEFAULT_DISTRO: jazzy
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment