Skip to content
Snippets Groups Projects
Commit d570e11f authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Merge branch '33-allow-a-way-of-testing-melodic-pipeline' into 'master' 

Resolve "Allow a way of testing melodic pipeline"

Closes #33

See merge request !60
parents ebed62aa 01f2ad7e
No related branches found
No related tags found
1 merge request!60Resolve "Allow a way of testing melodic pipeline"
Pipeline #48166 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+ 12
− 9
View file @ d570e11f
...@@ -38,19 +38,22 @@ industrial_ci_kinetic: ...@@ -38,19 +38,22 @@ industrial_ci_kinetic:
variables: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except: rules:
- tags - if: $CI_COMMIT_TAG
- melodic-devel when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- when: always
industrial_ci_melodic: industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
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: rules:
- melodic-devel - if: $CI_COMMIT_TAG
except: when: never
- tags - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
...@@ -73,8 +76,8 @@ industrial_ci_kinetic_deploy: ...@@ -73,8 +76,8 @@ industrial_ci_kinetic_deploy:
- docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev . - docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev .
- docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd .. - cd ..
only: rules:
- tags - if: $CI_COMMIT_TAG
clang_format: clang_format:
stage: postcheck stage: postcheck
......
.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+ 12
− 10
View file @ d570e11f
...@@ -31,7 +31,6 @@ before_script: ...@@ -31,7 +31,6 @@ before_script:
ROSINSTALL_FILENAME: ".rosinstall" ROSINSTALL_FILENAME: ".rosinstall"
BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE" BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --' CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
when: always
tags: tags:
- docker - docker
...@@ -40,19 +39,22 @@ industrial_ci_kinetic: ...@@ -40,19 +39,22 @@ industrial_ci_kinetic:
variables: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except: rules:
- tags - if: $CI_COMMIT_TAG
- melodic-devel when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- when: always
industrial_ci_melodic: industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
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: rules:
- melodic-devel - if: $CI_COMMIT_TAG
except: when: never
- tags - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
...@@ -75,8 +77,8 @@ industrial_ci_kinetic_deploy: ...@@ -75,8 +77,8 @@ industrial_ci_kinetic_deploy:
- docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev . - docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev .
- docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd .. - cd ..
only: rules:
- tags - if: $CI_COMMIT_TAG
clang_format: clang_format:
stage: postcheck stage: postcheck
......
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