diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 3d4013c5090a8628540ea9b6a6456f54e58ae267..1595d880cb85aa7e1a81b4d21fe33634d06b29fe 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -39,6 +39,15 @@ industrial_ci_kinetic: except: - tags +industrial_ci_melodic: + extends: .industrial_ci + variables: + ROS_DISTRO: melodic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + except: + - tags + allow_failure: yes + 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 458154977ee6bb89a30a2282cf689b55b017a361..e9bca39c72651aea5689aa20c2cb836c5ea48ea9 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -41,6 +41,15 @@ industrial_ci_kinetic: except: - tags +industrial_ci_melodic: + extends: .industrial_ci + variables: + ROS_DISTRO: melodic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + except: + - tags + allow_failure: yes + industrial_ci_kinetic_deploy: extends: .industrial_ci variables: