Commit 0600cc08 authored by Iñigo Moreno i Caireta's avatar Iñigo Moreno i Caireta
Browse files

Merge branch '39-yaml-lint-job-failed-317539' into 'master'

Resolve "yaml lint Job Failed #317539"

Closes #39

See merge request !66
parents 48d1fa62 853928c6
Pipeline #57002 passed with stage
in 11 seconds
include:
- project: tecnalia_robotics-public/gitlab_templates
file: ci-templates/auto-rules/kinetic-default.yml
\ No newline at end of file
file: ci-templates/auto-rules/kinetic-default.yml
include:
- project: tecnalia_robotics-public/gitlab_templates
file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
\ No newline at end of file
file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
include : ci-templates/auto-rules/no-default.yml
include: ci-templates/auto-rules/no-default.yml
variables:
DEFAULT_DISTRO: kinetic
\ No newline at end of file
DEFAULT_DISTRO: kinetic
include : ci-templates/auto-rules/no-default.yml
include: ci-templates/auto-rules/no-default.yml
variables:
DEFAULT_DISTRO: melodic
\ No newline at end of file
DEFAULT_DISTRO: melodic
include : ci-templates/core.yml
include: ci-templates/core.yml
workflow:
rules:
......@@ -60,7 +60,6 @@ industrial_ci_noetic:
- if: $BUILD_NOETIC
industrial_kinetic_deploy:
extends:
- industrial_ci_kinetic
......
include : ci-templates/auto-rules/no-default.yml
include: ci-templates/auto-rules/no-default.yml
variables:
DEFAULT_DISTRO: noetic
\ No newline at end of file
DEFAULT_DISTRO: noetic
include : ci-templates/auto-rules/with-rosinstall/no-default.yml
include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
DEFAULT_DISTRO: kinetic
\ No newline at end of file
DEFAULT_DISTRO: kinetic
include : ci-templates/auto-rules/with-rosinstall/no-default.yml
include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
DEFAULT_DISTRO: melodic
\ No newline at end of file
DEFAULT_DISTRO: melodic
include : ci-templates/auto-rules/no-default.yml
include: ci-templates/auto-rules/no-default.yml
.industrial_ci:
variables:
UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
UPSTREAM_WORKSPACE: .rosinstall
include : ci-templates/auto-rules/with-rosinstall/no-default.yml
include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
DEFAULT_DISTRO: noetic
\ No newline at end of file
DEFAULT_DISTRO: noetic
image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
......@@ -22,10 +21,10 @@ before_script:
- apk add --update bash coreutils tar wget
- docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
include :
include:
- ci-templates/syntax-check.yml
- ci-templates/industrial-ci-templates.yml
default:
tags:
- docker
\ No newline at end of file
- docker
......@@ -6,4 +6,4 @@ industrial_ci_kinetic:
extends: .industrial-ci
variables:
ROS_DISTRO: kinetic
UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
UPSTREAM_WORKSPACE: .rosinstall
include:
- project: tecnalia_robotics-public/gitlab_templates
file: ci-templates/core.yml
\ No newline at end of file
file: ci-templates/core.yml
.industrial_ci:
stage: build
before_script:
......
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