From 511e81f1dc3b902c4912782663d239454bd66ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Sun, 27 Jan 2019 11:23:39 +0100 Subject: [PATCH] jade is EOL use kinetic in tests and documentation instead --- .ci.rosinstall.jade => .ci.rosinstall.kinetic | 0 .gitlab-ci.yml | 8 ++++---- .travis.yml | 6 +++--- README.rst | 6 +++--- doc/index.rst | 10 +++++----- industrial_ci/package.xml | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) rename .ci.rosinstall.jade => .ci.rosinstall.kinetic (100%) diff --git a/.ci.rosinstall.jade b/.ci.rosinstall.kinetic similarity index 100% rename from .ci.rosinstall.jade rename to .ci.rosinstall.kinetic diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e579b0a4..f4f9698cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,13 +25,13 @@ indigo: variables: ROS_DISTRO: "indigo" -jade: - script: .industrial_ci/gitlab.sh ROS_DISTRO=jade # alternate syntax - kinetic: + script: .industrial_ci/gitlab.sh ROS_DISTRO=kinetic # alternate syntax + +melodic: script: .industrial_ci/gitlab.sh variables: - ROS_DISTRO: "kinetic" + ROS_DISTRO: "melodic" PRERELEASE: "true" # some internal tests diff --git a/.travis.yml b/.travis.yml index 87f47ba71..0549dc5e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,9 +50,9 @@ env: - ROS_DISTRO=indigo USE_DEB=false # Checking backup compatibility with UPSTREAM_WORKSPACE - ROS_DISTRO=indigo ADDITIONAL_DEBS="ros-indigo-opencv3" VERBOSE_OUTPUT='false' - ROS_DISTRO=indigo ADDITIONAL_DEBS="ros-hydro-opencv3" DEBUG_BASH='true' EXPECT_EXIT_CODE=100 # This should fail (trying from a wrong distro). - - ROS_DISTRO=jade UPSTREAM_WORKSPACE=file ROSINSTALL_FILENAME=.ci.rosinstall # Testing arbitrary file name without ROS_DISTRO suffix. As of 6/3/2016 this fails due to https://github.com/ros-industrial/industrial_core/pull/144#issuecomment-223186764 - - ROS_DISTRO=jade APTKEY_STORE_SKS=hkp://ha.pool.sks-keyservers.vet _DO_NOT_FOLD=true # Passing wrong SKS URL as a break test. Should still pass. - - ROS_DISTRO=jade UPSTREAM_WORKSPACE=file ROSINSTALL_FILENAME=.i.do.not.exist EXPECT_EXIT_CODE=1 + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file ROSINSTALL_FILENAME=.ci.rosinstall # Testing arbitrary file name without ROS_DISTRO suffix. As of 6/3/2016 this fails due to https://github.com/ros-industrial/industrial_core/pull/144#issuecomment-223186764 + - ROS_DISTRO=kinetic APTKEY_STORE_SKS=hkp://ha.pool.sks-keyservers.vet _DO_NOT_FOLD=true # Passing wrong SKS URL as a break test. Should still pass. + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file ROSINSTALL_FILENAME=.i.do.not.exist EXPECT_EXIT_CODE=1 - DOCKER_BASE_IMAGE="ros:kinetic-ros-base" ROS_REPO=ros NOT_TEST_BUILD='true' DEBUG_BASH='true' VERBOSE_OUTPUT='false' DOCKER_COMMIT="img_temp" POST_PROCESS='eval docker image inspect $DOCKER_COMMIT --format="$DOCKER_COMMIT: \"{{.Size}}\" bytes"' - ROS_DISTRO=kinetic APTKEY_STORE_SKS=hkp://ha.pool.sks-keyservers.vet # Passing wrong SKS URL as a break test. Should still pass. - ROS_DISTRO=lunar ROS_REPO=ros-shadow-fixed USE_MOCKUP='industrial_ci/mockups/industrial_ci_testpkg' diff --git a/README.rst b/README.rst index 2dc4197bc..f3c195cda 100644 --- a/README.rst +++ b/README.rst @@ -20,8 +20,8 @@ Some notable feature: * Checks if your package builds, installs without issues. If unit/system tests are defined run them. `ROS Prerelease Test `_ can optionally be run. * Proven to cover the general requirements of the ROS-based robotics repositories. Easily configurable. * Users can add custom pre/post processes. -* Covers ROS Indigo, Jade, Kinetic distribution. -* As of January 2017, this repo provides configuration for `Travis CI` only, although it should be easily deployed from other CI services. +* Covers ROS Hydro, Indigo, Jade, Kinetic, Lunar, Melodic distribution. +* This repo provides scripts for `Bitbucket CI`, `Gitlab CI`, and `Travis CI` only, but it can be easily adapted for other CI services. For a brief overall introduction, you could also check a presentation: @@ -40,7 +40,7 @@ For Travis CI 2. Add `.travis.yml` file to your repository root (`complete template `_): :: - + language: generic services: - docker diff --git a/doc/index.rst b/doc/index.rst index 2b497ae1a..8f9a2fed7 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -156,7 +156,7 @@ You can configure the behavior in `CI config <#terminology>`_ in your client rep Required environment variables: -* `ROS_DISTRO`: Version of ROS in all lower case. E.g.: `indigo` / `jade`. If is is set in the custom Docker (base) image, it might be omitted in the script call. +* `ROS_DISTRO`: Version of ROS in all lower case. E.g.: `indigo`. If is is set in the custom Docker (base) image, it might be omitted in the script call. Optional environment variables ++++++++++++++++++++++++++++++++ @@ -576,7 +576,7 @@ Have multiple .rosinstall files per ROS-distro ++++++++++++++++++++++++++++++++++++++++++++++ By adding `.$ROS_DISTRO` suffix to your `$ROSINSTALL_FILENAME` file, you can specify which file to use per your `$ROS_DISTRO`. So the syntax of the file name for this purpose is `$ROSINSTALL_FILENAME.$ROS_DISTRO`. -For example, let's say you want to test multiple distros (indigo, jade) and you have `.travis.rosinstall` and `.travis.rosinstall.jade` files in your repo. You can define the Travis config as: +For example, let's say you want to test multiple distros (indigo, kinetic) and you have `.travis.rosinstall` and `.travis.rosinstall.kinetic` files in your repo. You can define the Travis config as: :: @@ -584,9 +584,9 @@ For example, let's say you want to test multiple distros (indigo, jade) and you matrix: - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file - - ROS_DISTRO=jade UPSTREAM_WORKSPACE=file + - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file -With this config, for indigo default file name `.travis.rosinstall` will be seached and used if found. For jade, the file that consists of the default file name plus `.jade` suffix will be prioritized. +With this config, for indigo default file name `.travis.rosinstall` will be seached and used if found. For kinetic, the file that consists of the default file name plus `.kinetic` suffix will be prioritized. When `$ROSINSTALL_FILENAME.$ROS_DISTRO` file isn't found, `$ROSINSTALL_FILENAME` will be used for all jobs that define `UPSTREAM_WORKSPACE`. @@ -605,9 +605,9 @@ You can specify the OS and its distribution to run the CI job by setting `OS_NAM By default users don't need to set this and its value will be automatically guessed according to the value of `ROS_DISTRO`. e.g.:: `ROS_DISTRO=indigo` --> `OS_NAME=ubuntu` `OS_CODE_NAME=trusty` - `ROS_DISTRO=jade` --> `OS_NAME=ubuntu` `OS_CODE_NAME=trusty` `ROS_DISTRO=kinetic` --> `OS_NAME=ubuntu` `OS_CODE_NAME=xenial` `ROS_DISTRO=lunar` --> `OS_NAME=ubuntu` `OS_CODE_NAME=xenial` + `ROS_DISTRO=melodic` --> `OS_NAME=ubuntu` `OS_CODE_NAME=bionic` Use non-default Ubuntu distro +++++++++++++++++++++++++++++ diff --git a/industrial_ci/package.xml b/industrial_ci/package.xml index 1abd7dec8..de94bc2eb 100644 --- a/industrial_ci/package.xml +++ b/industrial_ci/package.xml @@ -6,8 +6,8 @@
  • Checks if your package builds, installs without issues. If unit/system tests are defined run them. ROS Prerelease Test can optionally be run.
  • Proven to cover the general requirements of the ROS-based robotics repositories. Easily configurable.
  • Users can add custom pre/post processes.
    • -
  • Covers ROS Indigo, Jade, Kinetic distribution.
    • -
  • As of January 2017, this repo provides configuration for Travis CI only, although it should be easily deployed from other CI services.
    • +
  • Covers ROS Hydro, Indigo, Jade, Kinetic, Lunar, Melodic distribution
    • +
  • This package provides scripts for `Bitbucket CI`, `Gitlab CI`, and `Travis CI` only, but it can be easily adapted for other CI services.
    • Apache License 2.0