Commit a66c89da authored by Jon Azpiazu's avatar Jon Azpiazu
Browse files

Merge branch 'add-melodic-ci-job' into 'master'

Add melodic ci job

See merge request !34
parents 4de1d1e8 71a4e0c1
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment