From 2461272191b6ed2df207543bc0a1df3e3ae7506f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Mon, 16 May 2022 13:35:49 +0200
Subject: [PATCH] [skip ci] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ae6df7..5b69561 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,15 @@ stages:
- demos
############ YAML ANCHORS ############
+.print_variables_template: &print_variables_definition
+ # Print variables
+ - echo $WOLF_CORE_BRANCH
+ - echo $WOLF_GNSS_BRANCH
+ - echo $CI_COMMIT_BRANCH
+ - echo $WOLF_ROS_NODE_BRANCH
+ - echo $WOLF_ROS_GNSS_BRANCH
+ - echo $GNSSUTILS_BRANCH
+
.preliminaries_template: &preliminaries_definition
## Install ssh-agent if not already installed, it is required by Docker.
## (change apt-get to yum if you use an RPM-based image)
@@ -90,9 +99,12 @@ stages:
- if [ -d gnss_utils ]; then
- echo "directory gnss_utils exists"
- cd gnss_utils
+ - git checkout devel
+ - git pull
+ - git checkout $GNSSUTILS_BRANCH
- git pull
- else
- - git clone ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/gauss_project/gnss_utils.git
+ - git clone -b $GNSSUTILS_BRANCH ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/gauss_project/gnss_utils.git
- cd gnss_utils
- git submodule update --init
- fi
@@ -124,17 +136,13 @@ stages:
.clone_wolfrosnode_template: &clone_wolfrosnode_definition
- roscd
- cd ../src
- - git clone ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_ros/wolf_ros_node.git
- - cd wolf_ros_node
- - git checkout $WOLF_ROS_CORE_BRANCH
+ - git clone -b $WOLF_ROS_CORE_BRANCH ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_ros/wolf_ros_node.git
.build_and_test_template: &build_and_test_definition
- roscd
- cd ../src
- - git clone ssh://git@gitlab.iri.upc.edu:2202/${CI_PROJECT_PATH}.git
- - cd wolf_ros_gnss
- - git checkout $CI_COMMIT_BRANCH
- - cd ../..
+ - git clone -b $CI_COMMIT_BRANCH ssh://git@gitlab.iri.upc.edu:2202/${CI_PROJECT_PATH}.git
+ - cd ..
- catkin_make
############ LICENSE HEADERS ############
@@ -143,6 +151,7 @@ license_headers:
image: labrobotica/wolf_deps_ros:20.04
cache: []
before_script:
+ - *print_variables_definition
- *preliminaries_definition
- *install_wolf_definition
script:
@@ -163,6 +172,7 @@ build_and_test:bionic:
paths:
- ci_deps/gnss/
before_script:
+ - *print_variables_definition
- *preliminaries_definition
- *install_wolf_definition
- *install_gnssutils_definition
@@ -187,6 +197,7 @@ build_and_test:focal:
paths:
- ci_deps/gnss/
before_script:
+ - *print_variables_definition
- *preliminaries_definition
- *install_wolf_definition
- *install_gnssutils_definition
@@ -202,6 +213,7 @@ demo_gnss:
variables:
WOLF_CORE_BRANCH: $WOLF_CORE_BRANCH
WOLF_GNSS_BRANCH: $WOLF_GNSS_BRANCH
+ GNSSUTILS_BRANCH: $GNSSUTILS_BRANCH
WOLF_ROS_CORE_BRANCH: $WOLF_ROS_CORE_BRANCH
WOLF_ROS_GNSS_BRANCH: $CI_COMMIT_BRANCH
trigger:
--
GitLab