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