diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 3d4013c5090a8628540ea9b6a6456f54e58ae267..78fa4975997c2b1bdd4f5adae4d776c6af14daf6 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -38,6 +38,18 @@ industrial_ci_kinetic: DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" except: - tags + - melodic-devel + +industrial_ci_melodic: + extends: .industrial_ci + variables: + ROS_DISTRO: melodic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + only: + - melodic-devel + except: + - tags + allow_failure: yes industrial_ci_kinetic_deploy: extends: .industrial_ci diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 458154977ee6bb89a30a2282cf689b55b017a361..4579b4bf871c73f32f264cb78533edca20d48e80 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -40,6 +40,18 @@ industrial_ci_kinetic: DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" except: - tags + - melodic-devel + +industrial_ci_melodic: + extends: .industrial_ci + variables: + ROS_DISTRO: melodic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + only: + - melodic-devel + except: + - tags + allow_failure: yes industrial_ci_kinetic_deploy: extends: .industrial_ci