Update docker image builder to support stable/2110

- Remove stable/2009 from docker image builder
- Remove centos-7 & debian-9 which is only required
  on stable/2009

Change-Id: I4ae47ca7dc8e833b003fb62dfd9036dca644e946
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/docker/scripts/build_executor_docker_image.sh b/docker/scripts/build_executor_docker_image.sh
index 17118be..672a112 100755 (executable)
--- a/docker/scripts/build_executor_docker_image.sh
+++ b/docker/scripts/build_executor_docker_image.sh
@@ -120,9 +120,6 @@ for executor_os_name in $os_names ; do
         debian*)
             generate_apt_dockerfile "$EXECUTOR_CLASS" "$executor_os_name" \
                                     "$docker_from_image" "$executor_docker_image" ;;
-        centos-7)
-            generate_yum_dockerfile "$EXECUTOR_CLASS" "$executor_os_name" \
-                                    "$docker_from_image" "$executor_docker_image" ;;
         centos-8)
             generate_dnf_dockerfile "$EXECUTOR_CLASS" "$executor_os_name" \
                                     "$docker_from_image" "$executor_docker_image" ;;

diff --git a/docker/scripts/dbld_lfit_requirements.sh b/docker/scripts/dbld_lfit_requirements.sh
index 278b78e..7067d99 100755 (executable)
--- a/docker/scripts/dbld_lfit_requirements.sh
+++ b/docker/scripts/dbld_lfit_requirements.sh
@@ -54,10 +54,5 @@ OLD_PATH="$PATH"
 python3 -m venv "$LF_VENV"
 PATH="$LF_VENV/bin:$PATH"
 python3 -m pip install --upgrade pip
-# on Debian-9 lftools needs to be installed before it is upgraded
-# in order to get the latest version.
-if [ "$OS_ID" = "debian"  ] && [ "$OS_VERSION_ID" = "9" ] ; then
-    python3 -m pip install lftools
-fi
 python3 -m pip install --upgrade --upgrade-strategy eager lftools
 PATH="$OLD_PATH"

diff --git a/docker/scripts/dbld_vpp_install_packages.sh b/docker/scripts/dbld_vpp_install_packages.sh
index 99d4908..aa34c1b 100755 (executable)
--- a/docker/scripts/dbld_vpp_install_packages.sh
+++ b/docker/scripts/dbld_vpp_install_packages.sh
@@ -42,8 +42,6 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
         # 'Make docs jobs are only run on ubuntu x86_64 executors
         #  so only run for ubuntu build executors.
         make_vpp "docs-venv" "$branch"
-    elif [ "$OS_NAME" = "debian-9" ] ; then
-        apt_override_cmake_install_with_pip3_version
     fi
 
     # Download, build, and cache external deps packages
@@ -86,8 +84,6 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
             dump_apt_package_list "$branch" ;;
         *debian*)
             dump_apt_package_list "$branch" ;;
-        *centos:7)
-            dump_yum_package_list "$branch" ;;
         *centos:8)
             dump_dnf_package_list "$branch" ;;
     esac

diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index 86b7c3f..d9543fd 100644 (file)
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -35,22 +35,6 @@ apt_install_packages() {
             --allow-change-held-packages $@
 }
 
-# Used for older OS distro's which are incompatible
-# with modern distro cmake vesrion
-apt_override_cmake_install_with_pip3_version() {
-    local os_cmake="/usr/bin/cmake"
-    local os_cmake_ver="$($os_cmake --version | head -1)"
-    local pip3_cmake="/usr/local/bin/cmake"
-
-    python3 -m pip --disable-pip-version-check install cmake || true
-    local pip3_cmake_ver="$($pip3_cmake --version | head -1)"
-    echo_log "Overriding $OS_NAME '$os_cmake_ver' with '$pip3_cmake_ver'!"
-    apt-get remove -y cmake --autoremove || true
-    update-alternatives --quiet --remove-all cmake || true
-    update-alternatives --quiet --install "$os_cmake" cmake "$pip3_cmake" 100
-    echo_log "Default cmake ($(which cmake)) version: '$(cmake --version | head -1)'!"
-}
-
 generate_apt_dockerfile_common() {
     local executor_class="$1"
     local executor_image="$2"
@@ -198,11 +182,6 @@ RUN apt-get update -qq \\
   && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | bash \\
 
 EOF
-    # Docker installation script fails on debian-9, so don't install docker
-    head $DOCKERFILE
-    if ! grep -qe 'debian:9' "$DOCKERFILE" ; then
-        echo "  && curl -fsSL https://get.docker.com | sh \ " >>"$DOCKERFILE"
-    fi
 
     cat <<EOF >>"$DOCKERFILE"
   && rm -r /var/lib/apt/lists/*
@@ -239,10 +218,6 @@ builder_generate_apt_dockerfile() {
     local executor_image="$3"
     local vpp_install_skip_sysctl_envvar="";
 
-    if grep -q "debian-9"  <<< "$executor_os_name" ; then
-        # Workaround to VPP package installation failure on debian-9
-        vpp_install_skip_sysctl_envvar="ENV VPP_INSTALL_SKIP_SYSCTL=1"
-    fi
     generate_apt_dockerfile_common $executor_class $executor_image
     csit_builder_generate_docker_build_files
     cat <<EOF >>"$DOCKERFILE"

diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index 3146684..3c7f4e4 100644 (file)
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -157,7 +157,7 @@ export EXECUTOR_CLASSES="$EXECUTOR_DEFAULT_CLASS csit_dut csit_shim"
 export EXECUTOR_ARCHS="aarch64 x86_64"
 declare -A EXECUTOR_CLASS_ARCH_OS_NAMES
 EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="centos-8 ubuntu-18.04 ubuntu-20.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="centos-7 centos-8 debian-9 debian-10 ubuntu-18.04 ubuntu-20.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="centos-8 debian-10 ubuntu-18.04 ubuntu-20.04"
 EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-18.04 ubuntu-20.04"
 EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-18.04 ubuntu-20.04"
 EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-18.04 ubuntu-20.04"

diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 6c064d0..cb33feb 100644 (file)
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -107,9 +107,6 @@ csit_install_packages() {
             debian*)
                 apt_install_packages $packages
                 ;;
-            centos-7)
-                yum_install_packages $packages
-                ;;
             centos-8)
                 dnf_install_packages $packages
                 ;;

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 89ea2b9..4e7a480 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -99,10 +99,8 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-7"]="stable/2009"
-VPP_BRANCHES["centos-8"]="stable/2009 stable/2101 stable/2106 master"
-VPP_BRANCHES["debian-9"]="stable/2009"
-VPP_BRANCHES["debian-10"]="stable/2009 stable/2101 stable/2106 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/2009 stable/2101 stable/2106 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2009 stable/2101 stable/2106 master"
+VPP_BRANCHES["centos-8"]="stable/2101 stable/2106 stable/2110 master"
+VPP_BRANCHES["debian-10"]="stable/2101 stable/2106 stable/2110 master"
+VPP_BRANCHES["ubuntu-18.04"]="stable/2101 stable/2106 stable/2110 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2101 stable/2106 stable/2110 master"
 export VPP_BRANCHES