From bf25336224982a99bc0a8abd5cc9e217817f3f94 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Fri, 8 Nov 2019 08:53:36 +0100
Subject: [PATCH] Add melodic jobs
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 9 +++++++++
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 3d4013c..1595d88 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 4581549..e9bca39 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:
--
GitLab