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

Add option to use the melodic-test branch

parent ebed62aa
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+ 2
− 2
View file @ 584393c4
...@@ -40,7 +40,7 @@ industrial_ci_kinetic: ...@@ -40,7 +40,7 @@ industrial_ci_kinetic:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except: except:
- tags - tags
- melodic-devel - /^melodic-.*/
industrial_ci_melodic: industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
...@@ -48,7 +48,7 @@ industrial_ci_melodic: ...@@ -48,7 +48,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only: only:
- melodic-devel - /melodic-.*/
except: except:
- tags - tags
......
.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+ 2
− 2
View file @ 584393c4
...@@ -42,7 +42,7 @@ industrial_ci_kinetic: ...@@ -42,7 +42,7 @@ industrial_ci_kinetic:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except: except:
- tags - tags
- melodic-devel - /^melodic-.*/
industrial_ci_melodic: industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
...@@ -50,7 +50,7 @@ industrial_ci_melodic: ...@@ -50,7 +50,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only: only:
- melodic-devel - /^melodic-.*/
except: except:
- tags - tags
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment