Resolve "Adapt to core cmake refactor"

Closes #3 (closed)

.gitlab-ci.yml

@@ -4,6 +4,16 @@ stages:
   - demos
   
 ############ YAML ANCHORS ############
+.print_variables_template: &print_variables_definition
+  # Print variables
+  - echo $WOLF_CORE_BRANCH
+  - echo $WOLF_LASER_BRANCH
+  - echo $WOLF_ROS_NODE_NODE
+  - echo $CI_COMMIT_BRANCH
+  - echo $WOLF_ROS_LASER_NODE
+  - echo $WOLF_ROS_LASER_BRANCH
+  - echo $LASERSCANUTILS_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)
@@ -91,9 +101,12 @@ stages:
   - if [ -d laser_scan_utils ]; then
   -   echo "directory laser_scan_utils exists"
   -   cd laser_scan_utils
+  -   git checkout main
+  -   git pull
+  -   git checkout $LASERSCANUTILS_BRANCH
   -   git pull
   - else
-  -   git clone https://gitlab.iri.upc.edu/labrobotica/algorithms/laser_scan_utils.git
+  -   git clone -b $LASERSCANUTILS_BRANCH https://gitlab.iri.upc.edu/labrobotica/algorithms/laser_scan_utils.git
   -   cd laser_scan_utils
   - fi
   - mkdir -pv build
@@ -160,17 +173,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 -b $WOLF_ROS_NODE_BRANCH clone 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_laser
-  - git checkout $CI_COMMIT_BRANCH
-  - cd ../..
+  - git clone -b $CI_COMMIT_BRANCHssh://git@gitlab.iri.upc.edu:2202/${CI_PROJECT_PATH}.git
+  - cd ..
   - catkin_make
 
 ############ LICENSE HEADERS ############
@@ -179,6 +188,7 @@ license_headers:
   image: labrobotica/wolf_deps_ros:20.04
   cache: []
   before_script:
+    - *print_variables_definition
     - *preliminaries_definition
     - *install_wolf_definition
   script:
@@ -193,6 +203,7 @@ build_and_test:bionic:
       paths:
       - ci_deps
   before_script:
+    - *print_variables_definition
     - *preliminaries_definition
     - *install_wolf_definition
     - *install_csm_definition
@@ -212,6 +223,7 @@ build_and_test:focal:
       paths:
       - ci_deps
   before_script:
+    - *print_variables_definition
     - *preliminaries_definition
     - *install_wolf_definition
     - *install_csm_definition
@@ -228,7 +240,8 @@ demo_laser:
   variables:
     WOLF_CORE_BRANCH: $WOLF_CORE_BRANCH
     WOLF_LASER_BRANCH: $WOLF_LASER_BRANCH
-    WOLF_ROS_CORE_BRANCH: $WOLF_ROS_CORE_BRANCH
+    WOLF_ROS_NODE_BRANCH: $WOLF_ROS_NODE_BRANCH
     WOLF_ROS_LASER_BRANCH: $CI_COMMIT_BRANCH
+    LASERSCANUTILS_BRANCH: $LASERSCANUTILS_BRANCH
   trigger: 
     project: mobile_robotics/wolf_projects/wolf_ros/demos/wolf_demo_laser2d