Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Xenial/Kinetic EOL #462

Merged
merged 10 commits into from
Jul 8, 2021
2 changes: 0 additions & 2 deletions jenkins-scripts/docker/gazebo-abichecker.bash
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ if [[ $GAZEBO_MAJOR_VERSION -lt 8 ]]; then
export ABI_JOB_CMAKE_PARAMS="-DENABLE_TESTS_COMPILATION:BOOL=False"
fi
export ABI_JOB_IGNORE_HEADERS="gazebo/GIMPACT gazebo/opcode gazebo/test"
# gcc6 causes gazebo ABI checker to fail
export USE_GCC6=0

. ${SCRIPT_DIR}/lib/generic-abi-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/lib/boilerplate_prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ init_stopwatch CREATE_TESTING_ENVIROMENT

# Default values - Provide them is prefered
if [ -z ${DISTRO} ]; then
DISTRO=xenial
DISTRO=bionic
fi

if [ -z ${ROS_DISTRO} ]; then
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/lib/debbuild-base.bash
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ fi

# Hack to avoid problems with dwz symbols starting in Ubuntu Disco if tmp and debugtmp are the
# same the build fails copying files because they are the same
if [[ $DISTRO != 'xenial' && $DISTRO != 'bionic' ]]; then
if [[ $DISTRO != 'bionic' ]]; then
sed -i -e 's:dwz" and:dwz" and (\$tmp ne \$debugtmp) and:' /usr/bin/dh_strip
fi

Expand Down
35 changes: 1 addition & 34 deletions jenkins-scripts/docker/lib/docker_generate_dockerfile.bash
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ fi
[[ -z ${NEED_C17_COMPILER} ]] && NEED_C17_COMPILER=false

export APT_PARAMS=
# workaround for changing our packages testing server
if [[ ${DISTRO} != 'xenial' && ${DISTRO} != 'trusty' && ${DISTRO} != 'stretch' ]]; then
export APT_PARAMS="--allow-releaseinfo-change"
chapulina marked this conversation as resolved.
Show resolved Hide resolved
fi

GZDEV_DIR=${WORKSPACE}/gzdev
GZDEV_BRANCH=${GZDEV_BRANCH:-master}
Expand Down Expand Up @@ -189,15 +185,9 @@ RUN dpkg-divert --rename --add /usr/sbin/invoke-rc.d \\
DELIM_DOCKER_PAM_BUG
fi

# dirmngr from Yaketty on needed by apt-key
# git and python-* for gzdev
if [[ $DISTRO != 'xenial' ]]; then
# not in xenial, available from Bionic on and all debians
extra_python_mod="python3-distro"
fi
cat >> Dockerfile << DELIM_DOCKER_DIRMNGR
RUN apt-get ${APT_PARAMS} update && \\
apt-get install -y dirmngr git python3 python3-docopt python3-yaml ${extra_python_mod}
apt-get install -y dirmngr git python3 python3-docopt python3-yaml python3-distro
DELIM_DOCKER_DIRMNGR

# Install necessary repositories using gzdev
Expand Down Expand Up @@ -251,29 +241,6 @@ RUN ${DOCKER_PREINSTALL_HOOK}
DELIM_WORKAROUND_PRE_HOOK
fi

# Dart repositories
if ${DART_FROM_PKGS} || ${DART_COMPILE_FROM_SOURCE}; then
if [[ $DISTRO == 'xenial' ]]; then
cat >> Dockerfile << DELIM_DOCKER_DART_PKGS
# Install dart from pkgs
RUN apt-get update \\
&& apt-get install -y apt-utils software-properties-common \\
&& rm -rf /var/lib/apt/lists/*
RUN apt-add-repository -y ppa:dartsim
DELIM_DOCKER_DART_PKGS
fi
fi

# Workaround a problem in simbody on artful bad paths
if [[ $DISTRO == "artful" ]]; then
cat >> Dockerfile << DELIM_DOCKER_WORKAROUND_SIMBODY
RUN apt-get update \\
&& apt-get install -y apt-utils software-properties-common \\
&& rm -rf /var/lib/apt/lists/*
RUN add-apt-repository ppa:j-rivero/simbody-artful
DELIM_DOCKER_WORKAROUND_SIMBODY
fi

# Install debian dependencies defined on the source code
DEPENDENCIES_PATH_TO_SEARCH=${SOFTWARE_DIR:=.}
SOURCE_DEFINED_DEPS="$(sort -u $(find ${DEPENDENCIES_PATH_TO_SEARCH} -iname 'packages-'$DISTRO'.apt' -o -iname 'packages.apt' | grep -v '/\.git/') | tr '\n' ' ')"
Expand Down
13 changes: 0 additions & 13 deletions jenkins-scripts/docker/lib/generic-abi-base.bash
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@ cat > build.sh << DELIM
#
set -ex

# Bug in gcc5 with eigen see: https://github.com/ignition-tooling/release-tools/issues/147
if [[ "${USE_GCC6}" -gt 0 || -z "${USE_GCC6}" && "${DISTRO}" == xenial ]]; then
apt-get update
apt-get install -y software-properties-common
add-apt-repository -y ppa:ubuntu-toolchain-r/test
apt-get update
apt-get install -y gcc-6 g++-6
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 10
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 10
update-alternatives --config gcc
update-alternatives --config g++
fi

if [ `expr length "${ABI_JOB_PRECHECKER_HOOK} "` -gt 1 ]; then
echo '# BEGIN SECTION: running pre ABI hook'
${ABI_JOB_PREABI_HOOK}
Expand Down
4 changes: 0 additions & 4 deletions jenkins-scripts/docker/lib/vrx-compilation-base.bash
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash -x

case ${DISTRO} in
'xenial')
ROS_DISTRO=kinetic
USE_DEFAULT_GAZEBO_VERSION_FOR_ROS=true
;;
'bionic')
# 9 is the default version in Bionic
ROS_DISTRO=melodic
Expand Down
33 changes: 0 additions & 33 deletions jenkins-scripts/docker/uctf-install-test-job.bash

This file was deleted.

5 changes: 2 additions & 3 deletions jenkins-scripts/dsl/_configs_/Globals.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class Globals

static CRON_EVERY_THREE_DAYS = 'H H * * H/3'

static gpu_by_distro = [ xenial : [ 'nvidia' ] ,
bionic : [ 'nvidia' ]]
static gpu_by_distro = [ bionic : [ 'nvidia' ]]

static ros_ci = [ 'melodic' : ['bionic'] ,
'noetic' : ['focal'] ,
Expand Down Expand Up @@ -58,7 +57,7 @@ class Globals
// Main CI platform
static ArrayList get_ci_distro()
{
return [ 'xenial' ]
return [ 'bionic' ]
}

static ArrayList get_abi_distro()
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/gazebo.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ String ci_build_any_job_name_linux = "gazebo-ci-pr_any-ubuntu_auto-amd64-gpu-${c
// Need to be used in ci_pr
String abi_job_name = ''

boolean is_watched_by_buildcop(branch, distro = 'xenial', gpu = 'nvidia')
boolean is_watched_by_buildcop(branch, distro = 'bionic', gpu = 'nvidia')

{
if (branch == 'master' || branch == 'gazebo9' || branch == 'gazebo11')
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/gzdev.dsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _configs_.*
import javaposse.jobdsl.dsl.Job

def supported_distros = [ 'xenial' ]
def supported_distros = [ 'bionic' ]
def supported_arches = [ 'amd64' ]


Expand Down
39 changes: 0 additions & 39 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -369,24 +369,6 @@ ignition_software.each { ign_sw ->
supported_arches.each { arch ->
supported_install_pkg_branches(ign_sw).each { major_version, supported_distros ->
supported_distros.each { distro ->
// no xenial support for cmake2 and things that use it
if (("${distro}" == "xenial") && (
(("${ign_sw}" == "cmake") && ("${major_version}" == "2")) ||
(("${ign_sw}" == "common") && ("${major_version}" != "1")) ||
(("${ign_sw}" == "fuel-tools") && ("${major_version}" != "1")) ||
("${ign_sw}" == "gazebo") ||
("${ign_sw}" == "gui") ||
("${ign_sw}" == "launch") ||
(("${ign_sw}" == "math") && ("${major_version}" == "6")) ||
(("${ign_sw}" == "msgs") && ("${major_version}" != "1")) ||
("${ign_sw}" == "physics") ||
("${ign_sw}" == "plugin") ||
("${ign_sw}" == "rendering") ||
("${ign_sw}" == "sensors") ||
(("${ign_sw}" == "transport") && ("${major_version}" != "4")) ||
("${ign_sw}" == "utils")))
return

extra_repos_str=""
if ((ign_sw in ignition_prerelease_pkgs) &&
(major_version in ignition_prerelease_pkgs[ign_sw]) &&
Expand Down Expand Up @@ -451,27 +433,6 @@ ignition_software.each { ign_sw ->
scm('@daily')
}

// no xenial for ign-physics/sensors/gazebo or plugin main/ign-plugin1
if (("${distro}" == "xenial") && (
("${ign_sw}" == "cmake" && "${branch}" == "ign-cmake2") ||
("${ign_sw}" == "cmake" && "${branch}" == "main") ||
("${ign_sw}" == "common" && "${branch}" != "ign-common1") ||
("${ign_sw}" == "fuel-tools" && "${branch}" != "ign-fuel-tools1") ||
("${ign_sw}" == "gazebo") ||
("${ign_sw}" == "gui") ||
("${ign_sw}" == "launch") ||
("${ign_sw}" == "math" && "${branch}" == "ign-math6") ||
("${ign_sw}" == "math" && "${branch}" == "main") ||
("${ign_sw}" == "msgs" && "${branch}" != "ign-msgs1") ||
("${ign_sw}" == "physics") ||
("${ign_sw}" == "plugin") ||
("${ign_sw}" == "rendering") ||
("${ign_sw}" == "sensors") ||
("${ign_sw}" == "tools") ||
("${ign_sw}" == "transport" && "${branch}" != "ign-transport4") ||
("${ign_sw}" == "utils")))
disabled()

steps {
shell("""\
#!/bin/bash -xe
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/ros1_ign_bridge.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bridge_packages.each { pkg ->
stringParam("VERSION",null,"Packages version to be built")
stringParam("RELEASE_VERSION", null, "Packages release version")
stringParam("LINUX_DISTRO", 'ubuntu', "Linux distribution to build packages for")
stringParam("DISTRO", "xenial", "Linux release inside LINUX_DISTRO to build packages for")
stringParam("DISTRO", "bionic", "Linux release inside LINUX_DISTRO to build packages for")
stringParam("ARCH", "amd64", "Architecture to build packages for")
stringParam('ROS_DISTRO', 'noetic','ROS DISTRO to build pakcages for')
stringParam("UPLOAD_TO_REPO", 'stable', "OSRF repo name to upload the package to")
Expand Down
4 changes: 0 additions & 4 deletions jenkins-scripts/dsl/sdformat.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ abi_distro.each { distro ->

// OTHER CI SUPPORTED JOBS (main branch) @ SCM/DAILY
other_supported_distros.each { distro ->
// main doesn't support xenial anymore
if ("${distro}" == "xenial")
return

supported_arches.each { arch ->
// ci_main job for the rest of arches / scm@daily
def sdformat_ci_job = job("sdformat-ci-main-${distro}-${arch}")
Expand Down
6 changes: 1 addition & 5 deletions jenkins-scripts/dsl/vrx.dsl
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import _configs_.*
import javaposse.jobdsl.dsl.Job

def ci_distro = [ 'bionic' : 'melodic',
'xenial' : 'kinetic' ]
def ci_distro = [ 'bionic' : 'melodic' ]
def supported_arches = [ 'amd64' ]

def ENABLE_TESTS = true
Expand Down Expand Up @@ -113,9 +112,6 @@ ci_distro.each { distro, ros_distro ->

install_default_job.with
{
if ("${ros_distro}" == "kinetic")
disabled()

triggers {
cron(Globals.CRON_EVERY_THREE_DAYS)
}
Expand Down
49 changes: 14 additions & 35 deletions jenkins-scripts/lib/dependencies_archive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,8 @@ fi
IGN_MATH_DEPENDENCIES="libeigen3-dev \\
ruby-dev \\
swig \\
libignition-cmake-dev"
if [[ ${DISTRO} != 'xenial' ]]; then
IGN_MATH_DEPENDENCIES="${IGN_MATH_DEPENDENCIES} \\
libignition-cmake2-dev"
fi
libignition-cmake-dev \\
libignition-cmake2-dev"

# IGN_TRANSPORT related dependencies. Default value points to the development
# version
Expand Down Expand Up @@ -425,23 +422,17 @@ IGN_COMMON_NO_IGN_DEPENDENCIES="pkg-config \\

IGN_COMMON_DEPENDENCIES="${IGN_COMMON_NO_IGN_DEPENDENCIES} \\
libignition-cmake-dev \\
libignition-math4-dev"
chapulina marked this conversation as resolved.
Show resolved Hide resolved
if [[ ${DISTRO} != 'xenial' ]]; then
IGN_COMMON_DEPENDENCIES="${IGN_COMMON_DEPENDENCIES} \\
libignition-cmake2-dev \\
libignition-math6-dev"
fi
libignition-cmake2-dev \\
libignition-math4-dev \\
libignition-math6-dev"

IGN_FUEL_TOOLS_DEPENDENCIES=" libignition-tools-dev \\
IGN_FUEL_TOOLS_DEPENDENCIES="libignition-cmake2-dev \\
libignition-common3-dev \\
libignition-tools-dev \\
libcurl4-openssl-dev \\
libjsoncpp-dev \\
libyaml-dev \\
libzip-dev"
if [[ ${DISTRO} != 'xenial' ]]; then
IGN_FUEL_TOOLS_DEPENDENCIES="${IGN_FUEL_TOOLS_DEPENDENCIES} \\
libignition-cmake2-dev \\
libignition-common3-dev"
fi

if [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} -eq 1 ]]; then
IGN_FUEL_TOOLS_DEPENDENCIES="${IGN_FUEL_TOOLS_DEPENDENCIES} \\
Expand Down Expand Up @@ -481,10 +472,7 @@ fi
IGN_GUI_NO_IGN_DEPENDENCIES="qtbase5-dev \\
qtdeclarative5-dev \\
libtinyxml2-dev \\
libqwt-qt5-dev"

if [[ ${DISTRO} != 'xenial' ]]; then
IGN_GUI_NO_IGN_DEPENDENCIES="${IGN_GUI_NO_IGN_DEPENDENCIES} \\
libqwt-qt5-dev \\
qml-module-qt-labs-folderlistmodel \\
qml-module-qt-labs-platform \\
qml-module-qt-labs-settings \\
Expand All @@ -499,19 +487,14 @@ if [[ ${DISTRO} != 'xenial' ]]; then
qml-module-qtquick-window2 \\
qml-module-qtquick2 \\
qtquickcontrols2-5-dev"
fi

IGN_GUI_DEPENDENCIES="${IGN_GUI_NO_IGN_DEPENDENCIES} \\
libignition-cmake2-dev \\
libignition-common3-dev \\
libignition-math6-dev \\
libignition-plugin-dev \\
libignition-tools-dev"

if [[ ${DISTRO} != 'xenial' ]]; then
IGN_GUI_DEPENDENCIES="${IGN_GUI_DEPENDENCIES} \\
libignition-cmake2-dev \\
libignition-common3-dev \\
libignition-math6-dev \\
libignition-plugin-dev"
fi

if [[ -n "${IGN_GUI_MAJOR_VERSION}" && ${IGN_GUI_MAJOR_VERSION} -ge 4 ]]; then
IGN_GUI_DEPENDENCIES="${IGN_GUI_DEPENDENCIES} \\
libignition-common3-dev"
Expand Down Expand Up @@ -542,11 +525,7 @@ elif [[ -n "${IGN_PHYSICS_MAJOR_VERSION}" && ${IGN_PHYSICS_MAJOR_VERSION} -eq 2
fi
IGN_PHYSICS_DART_FROM_PKGS="true"

IGN_PLUGIN_DEPENDENCIES=""
if [[ ${DISTRO} != 'xenial' ]]; then
IGN_PLUGIN_DEPENDENCIES="${IGN_PLUGIN_DEPENDENCIES} \\
libignition-cmake2-dev"
fi
IGN_PLUGIN_DEPENDENCIES="libignition-cmake2-dev"
chapulina marked this conversation as resolved.
Show resolved Hide resolved

IGN_LAUNCH_COMMON_DEPENDENCIES="libignition-cmake2-dev \\
libignition-common3-dev \\
Expand Down