diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 14ba3a963c4d169648ae2caf2accb1e2299d79da..52f541f25b05d134bafedb7ef777605819a6cff0 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -47,6 +47,8 @@ industrial_ci_kinetic: when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - when: always industrial_ci_melodic: @@ -57,8 +59,20 @@ industrial_ci_melodic: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ +industrial_ci_noetic: + extends: .industrial_ci + variables: + ROS_DISTRO: noetic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $CI_COMMIT_TAG + when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + industrial_ci_kinetic_deploy: extends: .industrial_ci variables: diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 490770cb2a9ec16482140c417dda4a0a70fe6c7e..80afb7ab7dc3d03496aa08d2f7b5e8e3a60e212b 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -49,6 +49,8 @@ industrial_ci_kinetic: when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - when: always industrial_ci_melodic: @@ -59,8 +61,20 @@ industrial_ci_melodic: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ +industrial_ci_noetic: + extends: .industrial_ci + variables: + ROS_DISTRO: noetic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $CI_COMMIT_TAG + when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + industrial_ci_kinetic_deploy: extends: .industrial_ci variables: