cleanedup ci setup and reverted back to using images from rduweston

This commit is contained in:
Ruixiang Du
2020-10-23 17:02:32 +08:00
parent 4085685e22
commit 923b4655f8

View File

@@ -1,10 +1,7 @@
## Build and test as standard C++ package ## Build and test as standard C++ package
xenial-cpp-build: xenial-cpp-build:
stage: build stage: build
image: ubuntu:16.04 image: rduweston/ubuntu-ci:16.04
before_script:
- apt-get update
- apt-get install -y build-essential git cmake
script: script:
- git submodule update --init --recursive - git submodule update --init --recursive
- mkdir build && cd build - mkdir build && cd build
@@ -13,10 +10,7 @@ xenial-cpp-build:
bionic-cpp-build: bionic-cpp-build:
stage: build stage: build
image: ubuntu:18.04 image: rduweston/ubuntu-ci:18.04
before_script:
- apt-get update
- apt-get install -y build-essential git cmake
script: script:
- git submodule update --init --recursive - git submodule update --init --recursive
- mkdir build && cd build - mkdir build && cd build
@@ -26,9 +20,6 @@ bionic-cpp-build:
focal-cpp-build: focal-cpp-build:
stage: build stage: build
image: rduweston/ubuntu-ci:20.04 image: rduweston/ubuntu-ci:20.04
before_script:
- apt-get update
- apt-get install -y build-essential git cmake
script: script:
- git submodule update --init --recursive - git submodule update --init --recursive
- mkdir build && cd build - mkdir build && cd build
@@ -38,7 +29,7 @@ focal-cpp-build:
## Build and test as catkin package ## Build and test as catkin package
kinetic-catkin-build: kinetic-catkin-build:
stage: build stage: build
image: rduweston/ubuntu-ci:kinetic-xenial image: rduweston/ubuntu-ci:kinetic
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
@@ -49,7 +40,7 @@ kinetic-catkin-build:
kinetic-catkin-isolated-build: kinetic-catkin-isolated-build:
stage: build stage: build
image: rduweston/ubuntu-ci:kinetic-xenial image: rduweston/ubuntu-ci:kinetic
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
@@ -60,7 +51,7 @@ kinetic-catkin-isolated-build:
melodic-catkin-build: melodic-catkin-build:
stage: build stage: build
image: rduweston/ubuntu-ci:melodic-bionic image: rduweston/ubuntu-ci:melodic
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
@@ -71,7 +62,7 @@ melodic-catkin-build:
melodic-catkin-isolated-build: melodic-catkin-isolated-build:
stage: build stage: build
image: rduweston/ubuntu-ci:melodic-bionic image: rduweston/ubuntu-ci:melodic
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
@@ -82,7 +73,7 @@ melodic-catkin-isolated-build:
noetic-catkin-build: noetic-catkin-build:
stage: build stage: build
image: rduweston/ubuntu-ci:noetic-focal image: rduweston/ubuntu-ci:noetic
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
@@ -93,7 +84,7 @@ noetic-catkin-build:
noetic-catkin-isolated-build: noetic-catkin-isolated-build:
stage: build stage: build
image: rduweston/ubuntu-ci:noetic-focal image: rduweston/ubuntu-ci:noetic
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk