Skip to content
Snippets Groups Projects

Resolve "Allow a way of testing melodic pipeline"

Merged Jon Azpiazu requested to merge 33-allow-a-way-of-testing-melodic-pipeline into master
1 file
+ 5
5
Compare changes
  • Side-by-side
  • Inline
@@ -40,10 +40,10 @@ industrial_ci_kinetic:
@@ -40,10 +40,10 @@ industrial_ci_kinetic:
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}"
rules:
rules:
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_TAG
when: never
when: never
 
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
 
when: never
- when: always
- when: always
industrial_ci_melodic:
industrial_ci_melodic:
@@ -52,9 +52,9 @@ industrial_ci_melodic:
@@ -52,9 +52,9 @@ industrial_ci_melodic:
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}"
rules:
rules:
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_TAG
when: never
when: never
 
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy:
industrial_ci_kinetic_deploy:
extends: .industrial_ci
extends: .industrial_ci
@@ -77,8 +77,8 @@ industrial_ci_kinetic_deploy:
@@ -77,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
Loading