Use new CMAKE_ARGS variable introduced in industrial_ci#369

This is not directly tied to catkin, and prepares for the migration to other
build tools.

.gitlab-industrial-ci-kinetic-no-rosinstall.yml

@@ -28,7 +28,7 @@ before_script:
     ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
     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 --'
+    CMAKE_ARGS: '-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context'
   when: always
 
 industrial_ci_kinetic:

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -30,7 +30,7 @@ before_script:
     ROSINSTALL_FILENAME: ".rosinstall"
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
     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 --'
+    CMAKE_ARGS: '-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context'
   when: always
 
 industrial_ci_kinetic: