Finish unfinished merge

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

@@ -24,21 +24,11 @@ before_script:
   script: .ci_config/gitlab.sh
   variables:
     ADDITIONAL_DEBS: curl
-<<<<<<< HEAD
     ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
     UPSTREAM_WORKSPACE: file
     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"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
-=======
-    ROS_DISTRO: kinetic
-    ROS_PARALLEL_JOBS: -j2 # keep this for now, since there seems to be memory limit issues in the ci VM
-    UPSTREAM_WORKSPACE: file
-    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
-    CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
->>>>>>> master
   when: always
   tags:
     - docker
@@ -54,13 +44,9 @@ industrial_ci_kinetic:
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci
   variables:
-<<<<<<< HEAD
     ROS_DISTRO: kinetic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash"
-=======
-    AFTER_SCRIPT: wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash
->>>>>>> master
     DOCKER_COMMIT: industrial_ci_image
   script:
     - .ci_config/gitlab.sh