docker builder: Remove code for deprecated OS (centos-8, debian-9)

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

9 files changed, 13 insertions, 958 deletions

diff --git a/docker/scripts/README.md b/docker/scripts/README.md
index 2c98aa95d..fbb549337 100644
--- a/docker/scripts/README.md
+++ b/docker/scripts/README.md
@@ -24,8 +24,7 @@ the executor image is as follows:
 2. For each OS package manager, there is a bash function which generates the
    Dockerfile for the specified OS which uses said package manager. For example,
    lib_apt.sh contains 'generate_apt_dockerfile()' which is executed for Ubuntu
-   and debian OS's.  lib_yum.sh and lib_dnf.sh contain similar functions for yum
-   (centos-7) and dnf (centos-8).
+   and debian OS's.
 
 3. The Dockerfiles contain the following sections:
  - a. Environment setup and copying of project workspace git repos
@@ -56,11 +55,8 @@ bash functions for use by the operational scripts.
 
 - `lib_csit.sh`: CSIT specific functions and environment variables
 
-- `lib_dnf.sh`: Dockerfile generation functions for dnf package manager.
-
 - `lib_vpp.sh`: VPP specific functions and environment variables
 
-- `lib_yum.sh`: Dockerfile generation functions for yum package manager.
 
 ## Bash Scripts
 
@@ -115,9 +111,7 @@ The following commands are useful to build the initial builder images:
 
 `cd <ci-managment repository directory>`
 
-`sudo ./docker/scripts/build_executor_docker_image.sh ubuntu-18.04 2>&1 | tee u1804-$(uname -m).log | grep -ve '^+'`
-
-`sudo ./docker/scripts/build_executor_docker_image.sh centos-7 2>&1 | tee centos7-$(uname -m).log | grep -ve '^+'`
+`sudo ./docker/scripts/build_executor_docker_image.sh ubuntu-20.04 2>&1 | tee u2004-$(uname -m).log | grep -ve '^+'`
 
 `sudo ./docker/scripts/build_executor_docker_image.sh -apr sandbox 2>&1 | tee all-sandbox-$(uname -m).log | grep -ve '^+'`
 
@@ -139,10 +133,10 @@ avoids the pitfalls encountered with Docker-In-Docker environments:
 The environment in the docker shell contains all of the necessary
 environment variable definitions so the docker scripts can be run
 directly on the cli.  Here is an example command that would be used in a CI job
-which automates the generation and testing of a new ubuntu-18.04 docker image
-and push it to Docker Hub fdiotools/builder-ubuntu1804:test-<arch>:
+which automates the generation and testing of a new ubuntu-20.04 docker image
+and push it to Docker Hub fdiotools/builder-ubuntu2004:test-<arch>:
 
-`build_executor_docker_image.sh -pr test ubuntu-18.04`
+`build_executor_docker_image.sh -pr test ubuntu-20.04`
 
 In the future, a fully automated CI/CD pipeline may be created for production
 docker images.
@@ -256,14 +250,10 @@ script will be written to automate the process.
 
 ## DockerHub Repositories
 
-- fdiotools/builder-centos7
-- fdiotools/builder-centos8
-- fdiotools/builder-debian9
 - fdiotools/builder-debian10
-- fdiotools/builder-ubuntu1804
 - fdiotools/builder-ubuntu2004
-- fdiotools/csit_dut-ubuntu1804
-- fdiotools/csit_shim-ubuntu1804
+- fdiotools/csit_dut-ubuntu2004
+- fdiotools/csit_shim-ubuntu2004
 
 ## Docker Image Tags
 
@@ -283,471 +273,3 @@ associated Jenkins-Nomad Label.
 Jenkins-Nomad Label.
 - test-aarch64: Tag used to select the aarch64 sandbox image by the associated
 Jenkins-Nomad Label.
-
-# Jenkins-Nomad Label Definitions
-
-<class>-<os>-<role>-<arch>  (e.g. builder-ubuntu1804-prod-x86_64)
-
-- class
--- builder
--- csit_dut
--- csit_shim
-
-- os
--- ubuntu1804
--- centos7
--- ubuntu2004
--- centos8
--- debian9
--- debian10
-
-- role
--- prod
--- test
--- sandbox
-
-- arch
--- x86_64
--- aarch64
-
-## Jenkins Nomad Plugin Node Labels
-
-### Common Attributes of All Jenkins Nomad Plugin Nodes
-- Disk: 3000
-- Priority: 50
-- Idle Termination Time: 10
-- Executors: 1
-- Usage: Only build jobs with label expressions matching this node
-- Workspace root: /w
-- Privileged: Y
-- Network: bridge
-- Force-pull: Y
-
-### Production (prod) Jenkins Nomad Plugin Nodes
-
-#### Node 'builder-ubuntu1804-prod-x86_64'
-- Labels: builder-ubuntu1804-prod-x86_64
-- Job Prefix: builder-ubuntu1804-prod-x86_64
-- Image: fdiotools/builder-ubuntu1804:prod-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu1804-prod-aarch64'
-- Labels: builder-ubuntu1804-prod-aarch64
-- Job Prefix: builder-ubuntu1804-prod-aarch64
-- Image: fdiotools/builder-ubuntu1804:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-centos7-prod-x86_64'
-- Labels: builder-centos7-prod-x86_64
-- Job Prefix: builder-centos7-prod-x86_64
-- Image: fdiotools/builder-centos7:prod-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-centos7-prod-aarch64'
-- Labels: builder-centos7-prod-aarch64
-- Job Prefix: builder-centos7-prod-aarch64
-- Image: fdiotools/builder-centos7:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu2004-prod-x86_64'
-- Labels: builder-ubuntu2004-prod-x86_64
-- Job Prefix: builder-ubuntu2004-prod-x86_64
-- Image: fdiotools/builder-ubuntu2004:prod-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu2004-prod-aarch64'
-- Labels: builder-ubuntu2004-prod-aarch64
-- Job Prefix: builder-ubuntu2004-prod-aarch64
-- Image: fdiotools/builder-ubuntu2004:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-centos8-prod-x86_64'
-- Labels: builder-centos8-prod-x86_64
-- Job Prefix: builder-centos7-prod-x86_64
-- Image: fdiotools/builder-centos8:prod-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-centos8-prod-aarch64'
-- Labels: builder-centos8-prod-aarch64
-- Job Prefix: builder-centos8-prod-aarch64
-- Image: fdiotools/builder-centos8:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-debian9-prod-x86_64'
-- Labels: builder-debian9-prod-x86_64
-- Job Prefix: builder-debian9-prod-x86_64
-- Image: fdiotools/builder-debian9:prod-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-debian9-prod-aarch64'
-- Labels: builder-debian9-prod-aarch64
-- Job Prefix: builder-debian9-prod-aarch64
-- Image: fdiotools/builder-debian9:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-debian10-prod-x86_64'
-- Labels: builder-debian10-prod-x86_64
-- Job Prefix: builder-debian10-prod-x86_64
-- Image: fdiotools/builder-debian10:prod-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-debian10-prod-aarch64'
-- Labels: builder-debian10-prod-aarch64
-- Job Prefix: builder-debian10-prod-aarch64
-- Image: fdiotools/builder-debian10:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'csit_dut-ubuntu1804-prod-x86_64'
-- Labels: csit_dut-ubuntu1804-prod-x86_64
-- Job Prefix: csit_dut-ubuntu1804-prod-x86_64
-- Image: fdiotools/csit_dut-ubuntu1804:prod-x86_64
-- CPU: 10000
-- Memory: 18000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: csit
-
-#### Node 'csit_dut-ubuntu1804-prod-aarch64'
-- Labels: csit_dut-ubuntu1804-prod-aarch64
-- Job Prefix: csit_dut-ubuntu1804-prod-aarch64
-- Image: fdiotools/csit_dut-ubuntu1804:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: csitarm
-
-#### Node 'csit_shim-ubuntu1804-prod-x86_64'
-- Labels: csit_shim-ubuntu1804-prod-x86_64
-- Job Prefix: csit_shim-ubuntu1804-prod-x86_64
-- Image: fdiotools/csit_shim-ubuntu1804:prod-x86_64
-- CPU: 10000
-- Memory: 18000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: csit
-
-#### Node 'csit_shim-ubuntu1804-prod-aarch64'
-- Labels: csit_shim-ubuntu1804-prod-aarch64
-- Job Prefix: csit_shim-ubuntu1804-prod-aarch64
-- Image: fdiotools/csit_shim-ubuntu1804:prod-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: csitarm
-
-### Sandbox (sandbox) Jenkins Nomad Plugin Nodes
-
-#### Node 'builder-ubuntu1804-sandbox-x86_64'
-- Labels: builder-ubuntu1804-sandbox-x86_64
-- Job Prefix: builder-ubuntu1804-sandbox-x86_64
-- Image: fdiotools/builder-ubuntu1804:sandbox-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu1804-sandbox-aarch64'
-- Labels: builder-ubuntu1804-sandbox-aarch64
-- Job Prefix: builder-ubuntu1804-sandbox-aarch64
-- Image: fdiotools/builder-ubuntu1804:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-centos7-sandbox-x86_64'
-- Labels: builder-centos7-sandbox-x86_64
-- Job Prefix: builder-centos7-sandbox-x86_64
-- Image: fdiotools/builder-centos7:sandbox-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-centos7-sandbox-aarch64'
-- Labels: builder-centos7-sandbox-aarch64
-- Job Prefix: builder-centos7-sandbox-aarch64
-- Image: fdiotools/builder-centos7:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu2004-sandbox-x86_64'
-- Labels: builder-ubuntu2004-sandbox-x86_64
-- Job Prefix: builder-ubuntu2004-sandbox-x86_64
-- Image: fdiotools/builder-ubuntu2004:sandbox-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu2004-sandbox-aarch64'
-- Labels: builder-ubuntu2004-sandbox-aarch64
-- Job Prefix: builder-ubuntu2004-sandbox-aarch64
-- Image: fdiotools/builder-ubuntu2004:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-centos8-sandbox-x86_64'
-- Labels: builder-centos8-sandbox-x86_64
-- Job Prefix: builder-centos8-sandbox-x86_64
-- Image: fdiotools/builder-centos8:sandbox-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-centos8-sandbox-aarch64'
-- Labels: builder-centos8-sandbox-aarch64
-- Job Prefix: builder-centos8-sandbox-aarch64
-- Image: fdiotools/builder-centos8:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-debian9-sandbox-x86_64'
-- Labels: builder-debian9-sandbox-x86_64
-- Job Prefix: builder-debian9-sandbox-x86_64
-- Image: fdiotools/builder-debian9:sandbox-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-debian9-sandbox-aarch64'
-- Labels: builder-debian9-sandbox-aarch64
-- Job Prefix: builder-debian9-sandbox-aarch64
-- Image: fdiotools/builder-debian9:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-debian10-sandbox-x86_64'
-- Labels: builder-debian10-sandbox-x86_64
-- Job Prefix: builder-debian10-sandbox-x86_64
-- Image: fdiotools/builder-debian10:sandbox-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-debian10-sandbox-aarch64'
-- Labels: builder-debian10-sandbox-aarch64
-- Job Prefix: builder-debian10-sandbox-aarch64
-- Image: fdiotools/builder-debian10:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'csit_dut-ubuntu1804-sandbox-x86_64'
-- Labels: csit_dut-ubuntu1804-sandbox-x86_64
-- Job Prefix: csit_dut-ubuntu1804-sandbox-x86_64
-- Image: fdiotools/csit_dut-ubuntu1804:sandbox-x86_64
-- CPU: 10000
-- Memory: 18000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: csit
-
-#### Node 'csit_dut-ubuntu1804-sandbox-aarch64'
-- Labels: csit_dut-ubuntu1804-sandbox-aarch64
-- Job Prefix: csit_dut-ubuntu1804-sandbox-aarch64
-- Image: fdiotools/csit_dut-ubuntu1804:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: csitarm
-
-#### Node 'csit_shim-ubuntu1804-sandbox-x86_64'
-- Labels: csit_shim-ubuntu1804-sandbox-x86_64
-- Job Prefix: csit_shim-ubuntu1804-sandbox-x86_64
-- Image: fdiotools/csit_shim-ubuntu1804:sandbox-x86_64
-- CPU: 10000
-- Memory: 18000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: csit
-
-#### Node 'csit_shim-ubuntu1804-sandbox-aarch64'
-- Labels: csit_shim-ubuntu1804-sandbox-aarch64
-- Job Prefix: csit_shim-ubuntu1804-sandbox-aarch64
-- Image: fdiotools/csit_shim-ubuntu1804:sandbox-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: csitarm
-
-### Automated Testing (test) Jenkins Nomad Plugin Nodes
-
-#### Node 'builder-ubuntu1804-test-x86_64'
-- Labels: builder-ubuntu1804-test-x86_64
-- Job Prefix: builder-ubuntu1804-test-x86_64
-- Image: fdiotools/builder-ubuntu1804:test-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu1804-test-aarch64'
-- Labels: builder-ubuntu1804-test-aarch64
-- Job Prefix: builder-ubuntu1804-test-aarch64
-- Image: fdiotools/builder-ubuntu1804:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-centos7-test-x86_64'
-- Labels: builder-centos7-test-x86_64
-- Job Prefix: builder-centos7-test-x86_64
-- Image: fdiotools/builder-centos7:test-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-centos7-test-aarch64'
-- Labels: builder-centos7-test-aarch64
-- Job Prefix: builder-centos7-test-aarch64
-- Image: fdiotools/builder-centos7:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu2004-test-x86_64'
-- Labels: builder-ubuntu2004-test-x86_64
-- Job Prefix: builder-ubuntu2004-test-x86_64
-- Image: fdiotools/builder-ubuntu2004:test-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-ubuntu2004-test-aarch64'
-- Labels: builder-ubuntu2004-test-aarch64
-- Job Prefix: builder-ubuntu2004-test-aarch64
-- Image: fdiotools/builder-ubuntu2004:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-centos8-test-x86_64'
-- Labels: builder-centos8-test-x86_64
-- Job Prefix: builder-centos8-test-x86_64
-- Image: fdiotools/builder-centos8:test-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-centos8-test-aarch64'
-- Labels: builder-centos8-test-aarch64
-- Job Prefix: builder-centos8-test-aarch64
-- Image: fdiotools/builder-centos8:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-debian9-test-x86_64'
-- Labels: builder-debian9-test-x86_64
-- Job Prefix: builder-debian9-test-x86_64
-- Image: fdiotools/builder-debian9:test-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-debian9-test-aarch64'
-- Labels: builder-debian9-test-aarch64
-- Job Prefix: builder-debian9-test-aarch64
-- Image: fdiotools/builder-debian9:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'builder-debian10-test-x86_64'
-- Labels: builder-debian10-test-x86_64
-- Job Prefix: builder-debian10-test-x86_64
-- Image: fdiotools/builder-debian10:test-x86_64
-- CPU: 14000
-- Memory: 14000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: builder
-
-#### Node 'builder-debian10-test-aarch64'
-- Labels: builder-debian10-test-aarch64
-- Job Prefix: builder-debian10-test-aarch64
-- Image: fdiotools/builder-debian10:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: builder
-
-#### Node 'csit_dut-ubuntu1804-sandbox-x86_64'
-- Labels: csit_dut-ubuntu1804-sandbox-x86_64
-- Job Prefix: csit_dut-ubuntu1804-sandbox-x86_64
-- Image: fdiotools/csit_dut-ubuntu1804:sandbox-x86_64
-- CPU: 10000
-- Memory: 18000
-- ${attr.cpu.arch}: amd64
-- ${node.class}: csit
-
-#### Node 'csit_dut-ubuntu1804-test-aarch64'
-- Labels: csit_dut-ubuntu1804-test-aarch64
-- Job Prefix: csit_dut-ubuntu1804-test-aarch64
-- Image: fdiotools/csit_dut-ubuntu1804:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: csitarm
-
-#### Node 'csit_shim-ubuntu1804-test-aarch64'
-- Labels: csit_shim-ubuntu1804-test-aarch64
-- Job Prefix: csit_shim-ubuntu1804-test-aarch64
-- Image: fdiotools/csit_shim-ubuntu1804:test-aarch64
-- CPU: 6000
-- Memory: 10000
-- ${attr.cpu.arch}: arm64
-- ${node.class}: csitarm
diff --git a/docker/scripts/build_executor_docker_image.sh b/docker/scripts/build_executor_docker_image.sh
index 672a112b9..7a731956e 100755
--- a/docker/scripts/build_executor_docker_image.sh
+++ b/docker/scripts/build_executor_docker_image.sh
@@ -25,8 +25,6 @@ export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
 . "$CIMAN_DOCKER_SCRIPTS/lib_vpp.sh"
 . "$CIMAN_DOCKER_SCRIPTS/lib_csit.sh"
 . "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh"
-. "$CIMAN_DOCKER_SCRIPTS/lib_yum.sh"
-. "$CIMAN_DOCKER_SCRIPTS/lib_dnf.sh"
 
 all_os_names=""
 ci_tag=""
@@ -120,9 +118,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-8)
-            generate_dnf_dockerfile "$EXECUTOR_CLASS" "$executor_os_name" \
-                                    "$docker_from_image" "$executor_docker_image" ;;
         *)
             echo "ERROR: Don't know how to generate dockerfile for OS $executor_os_name!"
             usage ;;
diff --git a/docker/scripts/dbld_csit_find_ansible_packages.py b/docker/scripts/dbld_csit_find_ansible_packages.py
index 7f34fb9d3..9da578d25 100755
--- a/docker/scripts/dbld_csit_find_ansible_packages.py
+++ b/docker/scripts/dbld_csit_find_ansible_packages.py
@@ -75,8 +75,6 @@ def main(args: List[str]) -> None:
     for arg in args:
         if arg.lower() == '--ubuntu':
             distro = 'ubuntu'
-        elif arg.lower() == '--centos':
-            distro = 'centos'
         elif arg.lower() == '--x86_64':
             arch = 'x86_64'
         elif arg.lower() == '--aarch64':
diff --git a/docker/scripts/dbld_vpp_install_packages.sh b/docker/scripts/dbld_vpp_install_packages.sh
index d6e526298..7672a7c6c 100755
--- a/docker/scripts/dbld_vpp_install_packages.sh
+++ b/docker/scripts/dbld_vpp_install_packages.sh
@@ -18,8 +18,6 @@ set -euxo pipefail
 export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
 . "$CIMAN_DOCKER_SCRIPTS/lib_vpp.sh"
 . "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh"
-. "$CIMAN_DOCKER_SCRIPTS/lib_yum.sh"
-. "$CIMAN_DOCKER_SCRIPTS/lib_dnf.sh"
 
 must_be_run_in_docker_build
 
@@ -37,7 +35,6 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
 
     # Install OS packages
     make_vpp "install-dep" "$branch"
-    make_vpp "centos-pyyaml" "$branch" # VPP Makefile tests for centos versions
     if [ "$OS_ID" = "ubuntu" ] && [ "$OS_ARCH" = "x86_64" ] ; then
         # 'Make docs jobs are only run on ubuntu x86_64 executors
         #  so only run for ubuntu build executors.
@@ -50,16 +47,6 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
     rsync -ac $vpp_ext_dir/downloads/. $DOCKER_DOWNLOADS_DIR || true
     if which apt >/dev/null ; then
         vpp_ext_deps_pkg=$vpp_ext_dir/$(dpkg -l vpp-ext-deps 2>/dev/null | mawk '/vpp-ext-deps/{print $2"_"$3"_"$4".deb"}')
-    elif which dnf >/dev/null ; then
-        inst_vpp_ext_deps="$(dnf list vpp-ext-deps 2>/dev/null | grep vpp-ext-deps)"
-        vpp_ext_deps_ver="$(echo $inst_vpp_ext_deps | mawk '{print $2}')"
-        vpp_ext_deps_arch="$(echo $inst_vpp_ext_deps | mawk '{print $1}'| cut -d'.' -f2)"
-        vpp_ext_deps_pkg="$vpp_ext_dir/vpp-ext-deps-${vpp_ext_deps_ver}.${vpp_ext_deps_arch}.rpm"
-    elif which yum >/dev/null ; then
-        inst_vpp_ext_deps="$(yum list vpp-ext-deps 2>/dev/null | grep vpp-ext-deps)"
-        vpp_ext_deps_ver="$(echo $inst_vpp_ext_deps | mawk '{print $2}')"
-        vpp_ext_deps_arch="$(echo $inst_vpp_ext_deps | mawk '{print $1}' | cut -d'.' -f2)"
-        vpp_ext_deps_pkg="$vpp_ext_dir/vpp-ext-deps-${vpp_ext_deps_ver}.${vpp_ext_deps_arch}.rpm"
     else
         echo "ERROR: Package Manager not installed!"
         exit 1
@@ -88,8 +75,6 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
             dump_apt_package_list "$branch" ;;
         *debian*)
             dump_apt_package_list "$branch" ;;
-        *centos:8)
-            dump_dnf_package_list "$branch" ;;
     esac
 done
 
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index 3c7f4e4ee..57169d842 100644
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -156,8 +156,8 @@ export EXECUTOR_CLASS_ARCH="$EXECUTOR_DEFAULT_CLASS-$OS_ARCH"
 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-8 debian-10 ubuntu-18.04 ubuntu-20.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-18.04 ubuntu-20.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="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 cb33febc5..31afde094 100644
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -23,8 +23,6 @@ alias lib_csit_imported=true
 export CIMAN_DOCKER_SCRIPTS="${CIMAN_DOCKER_SCRIPTS:-$(dirname $BASH_SOURCE)}"
 . "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
 . "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh"
-. "$CIMAN_DOCKER_SCRIPTS/lib_yum.sh"
-. "$CIMAN_DOCKER_SCRIPTS/lib_dnf.sh"
 
 CSIT_SUPPORTED_EXECUTOR_CLASSES="builder csit_dut"
 csit_supported_executor_class() {
@@ -36,9 +34,6 @@ csit_supported_executor_class() {
 
 csit_supported_os() {
     case "$1" in
-        # TODO: Remove ubuntu-18.04 once CSIT has completed transition
-        #       to ubuntu-20.04
-        ubuntu-18.04) return 0 ;;
         ubuntu-20.04) return 0 ;;
                    *) ;;
     esac
@@ -70,18 +65,7 @@ csit_install_packages() {
     bld_log="${bld_log}-$branchname-csit_install_packages-bld.log"
 
     git clean -qfdx
-
-    # Install PyYAML required by dbld_csit_find_ansible_packages.py
-    #
-    # Note: Conditional install due to Bug 1696324 -
-    #       Update to python3.6 breaks PyYAML dependencies
-    # Status:       CLOSED CANTFIX
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1696324
-    if [ "$OS_NAME" = "centos-8" ] ; then
-        dnf_install_packages python3-pyyaml
-    else
-        python3 -m pip install pyyaml
-    fi
+    python3 -m pip install pyyaml
 
     local exclude_roles="-e calibration -e kernel -e mellanox -e nomad -e consul"
     [ "$OS_ARCH" = "aarch64" ] && exclude_roles="$exclude_roles -e iperf"
@@ -91,14 +75,10 @@ csit_install_packages() {
     packages="$(dbld_csit_find_ansible_packages.py --$OS_ID --$OS_ARCH $yaml_files)"
     packages="${packages/bionic /}"
     packages="${packages/focal /}"
+    packages="${packages/libmbedcrypto1/libmbedcrypto3}"
+    packages="${packages/libmbedtls10/libmbedtls12}"
+    packages="$(echo ${packages//python\-/python3\-} | tr ' ' '\n' | sort -u | xargs)"
 
-    # TODO: Fix Ubuntu-18.04 specific package names that fail on Ubuntu-20.04
-    #       (remove when CSIT is updated)
-    if [ "$OS_NAME" = "ubuntu-20.04" ] ; then
-        packages="${packages/libmbedcrypto1/libmbedcrypto3}"
-        packages="${packages/libmbedtls10/libmbedtls12}"
-        packages="$(echo ${packages//python\-/python3\-} | tr ' ' '\n' | sort -u | xargs)"
-    fi
     if [ -n "$packages" ] ; then
         case "$OS_NAME" in
             ubuntu*)
@@ -107,9 +87,6 @@ csit_install_packages() {
             debian*)
                 apt_install_packages $packages
                 ;;
-            centos-8)
-                dnf_install_packages $packages
-                ;;
             *)
                 echo "Unsupported OS ($OS_ID): CSIT packages NOT INSTALLED!"
                 ;;
diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh
deleted file mode 100644
index c60621698..000000000
--- a/docker/scripts/lib_dnf.sh
+++ /dev/null
@@ -1,209 +0,0 @@
-# lib_dnf.sh - Docker build script dnf library.
-#              For import only.
-
-# Copyright (c) 2021 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Don't import more than once.
-if [ -n "$(alias lib_dnf_imported 2> /dev/null)" ] ; then
-    return 0
-fi
-alias lib_dnf_imported="true"
-
-export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
-. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
-
-dump_dnf_package_list() {
-    branchname="$(echo $branch | sed -e 's,/,_,')"
-    dnf list installed > \
-        "$DOCKER_BUILD_LOG_DIR/$FDIOTOOLS_IMAGENAME-$branchname-dnf-packages.log"
-}
-
-dnf_install_packages() {
-    dnf install -y "$@"
-}
-
-generate_dnf_dockerfile_clean() {
-    cat <<EOF >>"$DOCKERFILE"
-
-# Clean up
-RUN dbld_dump_build_logs.sh \\
-  && rm -rf "/tmp/*" "/root/.ccache"
-EOF
-}
-
-generate_dnf_dockerfile_common() {
-    cat <<EOF >>"$DOCKERFILE"
-
-# Build Environment Variables
-ENV FDIOTOOLS_IMAGE="$executor_image"
-ENV FDIOTOOLS_EXECUTOR_CLASS="$executor_class"
-ENV CIMAN_ROOT="$DOCKER_CIMAN_ROOT"
-ENV PATH="\$PATH:$DOCKER_CIMAN_ROOT/docker/scripts"
-
-# Copy-in build tree containing
-# ci-management, vpp, & csit git repos
-WORKDIR $DOCKER_BUILD_DIR
-COPY . .
-
-# Configure locales
-RUN LC_ALL=C.UTF-8 dnf install -y glibc-langpack-en
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US" LC_ALL="en_US.UTF-8"
-
-# Install baseline packages (minimum build & utils).
-#
-# ci-management global-jjb requirements:
-#    for lftools:
-#        libxml2-devel
-#        libxslt-devel
-#        xmlstarlet
-#    for lf-env.sh:
-#        facter
-#   from packer/provision/baseline.sh:
-#        deltarpm
-#        unzip
-#        xz
-#        python3-pip
-#        git
-#        git-review
-#        perl-XML-XPath
-#        make
-#        wget
-#
-# TODO:  Fix broken project requirement install targets
-#        graphviz           for 'make bootstrap-doxygen' (VPP)
-#        doxygen            for 'make doxygen' (VPP)
-#        enchant            for 'make docs' (VPP)
-#        libffi-devel       for python cffi install (Ubuntu20.04/VPP/aarch64)
-#        libpcap-devel      for python pypcap install (CSIT)
-#        lapack-devel       for python numpy/scipy (CSIT/aarch64)
-#        openblas-devel     for python numpy/scipy (CSIT/aarch64)
-#        sshpass            for CSIT
-#
-RUN dnf update -y \\
-  && dnf install -y \\
-         dnf-plugins-core \\
-         epel-release \\
-  && dnf config-manager --set-enabled \$(dnf repolist all 2> /dev/null | grep -i powertools | cut -d' ' -f1) --set-enabled epel \\
-  && dnf repolist all \\
-  && dnf clean all
-RUN dnf install -y \\
-        dnf-utils \\
-        bind-utils \\
-        doxygen \\
-        enchant \\
-        emacs \\
-        facter \\
-        gdb \\
-        git \\
-        git-review \\
-        graphviz \\
-        iproute \\
-        java-1.8.0-openjdk \\
-        java-1.8.0-openjdk-devel \\
-        jq \\
-        lapack-devel \\
-        libffi-devel \\
-        libpcap-devel \\
-        libxml2-devel \\
-        libxslt-devel \\
-        make \\
-        mawk \\
-        openblas-devel \\
-        perl \\
-        perl-XML-XPath \\
-        python3-pip \\
-        rsync \\
-        ruby-devel \\
-        sshpass \\
-        sysstat \\
-        sudo \\
-        tree \\
-        unzip \\
-        vim \\
-        wget \\
-        xmlstarlet \\
-        xz \\
-   && curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | bash \\
-   && curl -fsSL https://get.docker.com | sh \\
-   && dnf clean all
-
-# Install OS packages for project branches
-#
-RUN dbld_vpp_install_packages.sh \\
-  && dbld_csit_install_packages.sh \\
-  && dnf clean all
-EOF
-}
-
-builder_generate_dnf_dockerfile() {
-    local executor_class="$1"
-    local executor_os_name="$2"
-    local from_image="$3"
-    local executor_image="$4"
-
-    generate_dnf_dockerfile_common "$executor_class" "$executor_image"
-    cat <<EOF >>"$DOCKERFILE"
-
-# Install LF-IT requirements
-ENV LF_VENV="/root/lf-venv"
-RUN dbld_lfit_requirements.sh \\
-  && dnf clean all
-
-# Install packagecloud requirements
-RUN gem install package_cloud \\
-  && curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | bash
-
-# CI Runtime Environment
-WORKDIR /
-ENV VPP_ZOMBIE_NOCHECK="1"
-ENV CCACHE_DIR="/scratch/ccache"
-ENV CCACHE_MAXSIZE="10G"
-EOF
-    generate_dnf_dockerfile_clean
-}
-
-csit_generate_dnf_dockerfile() {
-    echo_log "ERROR: ${FUNCNAME[0]} TBD!"
-    exit 1
-}
-
-csit_dut_generate_dnf_dockerfile() {
-    echo_log "ERROR: ${FUNCNAME[0]} TBD!"
-    exit 1
-}
-
-csit_shim_generate_dnf_dockerfile() {
-    echo_log "ERROR: ${FUNCNAME[0]} TBD!"
-    exit 1
-}
-
-generate_dnf_dockerfile() {
-    local executor_class="$1"
-    local executor_os_name="$2"
-    local from_image="$3"
-    local executor_image="$4"
-
-    cat <<EOF  >"$DOCKERIGNOREFILE"
-**/__pycache__
-*.pyc
-EOF
-    cat <<EOF  >"$DOCKERFILE"
-FROM $from_image AS ${executor_class}-executor-image
-LABEL Description="FD.io CI '$executor_class' executor docker image for $executor_os_name/$OS_ARCH"
-LABEL Vendor="fd.io"
-LABEL Version="$DOCKER_TAG"
-EOF
-    ${executor_class}_generate_dnf_dockerfile "$executor_class" \
-       "$executor_os_name" "$from_image" "$executor_image"
-}
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index a48fdbd54..6b36338f4 100644
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -99,7 +99,6 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-8"]="stable/2106 stable/2110 master"
 VPP_BRANCHES["debian-10"]="stable/2106 stable/2110 stable/2202 master"
 VPP_BRANCHES["ubuntu-18.04"]="stable/2106 stable/2110"
 VPP_BRANCHES["ubuntu-20.04"]="stable/2106 stable/2110 stable/2202 master"
diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh
deleted file mode 100644
index fe0bc5355..000000000
--- a/docker/scripts/lib_yum.sh
+++ /dev/null
@@ -1,212 +0,0 @@
-# lib_yum.sh - Docker build script yum library.
-#              For import only.
-
-# Copyright (c) 2021 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Don't import more than once.
-if [ -n "$(alias lib_yum_imported 2> /dev/null)" ] ; then
-    return 0
-fi
-alias lib_yum_imported="true"
-
-export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
-. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
-
-dump_yum_package_list() {
-    branchname="$(echo $branch | sed -e 's,/,_,')"
-    yum list installed > \
-        "$DOCKER_BUILD_LOG_DIR/$FDIOTOOLS_IMAGENAME-$branchname-yum-packages.log"
-}
-
-yum_install_packages() {
-    yum install -y "$@"
-}
-
-generate_yum_dockerfile_common() {
-    local executor_class="$1"
-    local executor_image="$2"
-
-    cat <<EOF >>"$DOCKERFILE"
-
-# Create download dir to cache external tarballs
-WORKDIR $DOCKER_DOWNLOADS_DIR
-
-# Copy-in temporary build tree containing
-# ci-management, vpp, & csit git repos
-WORKDIR $DOCKER_BUILD_DIR
-COPY . .
-
-# Build Environment Variables
-ENV FDIOTOOLS_IMAGE=$executor_image
-ENV FDIOTOOLS_EXECUTOR_CLASS=$executor_class
-ENV CIMAN_ROOT="$DOCKER_CIMAN_ROOT"
-ENV PATH=$PATH:$DOCKER_CIMAN_ROOT/docker/scripts
-ENV LF_VENV="/root/lf-venv"
-
-# Configure locales
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US LC_ALL=en_US.UTF-8
-
-# Install baseline packages (minimum build & utils).
-#
-# ci-management global-jjb requirements:
-#    for lftools:
-#        libxml2-devel
-#        libxslt-devel
-#        xmlstarlet
-#    for lf-env.sh:
-#        facter
-#   from packer/provision/baseline.sh:
-#        deltarpm
-#        unzip
-#        xz
-#        python3-pip
-#        git
-#        git-review
-#        perl-XML-XPath
-#        make
-#        wget
-#
-# TODO:  Fix broken project requirement install targets
-#        graphviz           for 'make bootstrap-doxygen' (VPP)
-#        doxygen            for 'make doxygen' (VPP)
-#        enchant            for 'make docs' (VPP)
-#        libffi-devel       for python cffi install (Ubuntu20.04/VPP/aarch64)
-#        libpcap-devel      for python pypcap install (CSIT)
-#        liblapack-devel    for python numpy/scipy (CSIT/aarch64)
-#        libopenblas-devel  for python numpy/scipy (CSIT/aarch64)
-#        sshpass            for CSIT
-#
-RUN yum update -y \\
-  && yum install -y epel-release \\
-  && yum clean all
-RUN yum install -y \\
-        yum-utils \\
-        bind-utils \\
-        deltarpm \\
-        doxygen \\
-        enchant \\
-        emacs \\
-        facter \\
-        gdb \\
-        git \\
-        git-review \\
-        graphviz \\
-        iproute \\
-        java-1.8.0-openjdk \\
-        java-1.8.0-openjdk-devel \\
-        jq \\
-        libffi-devel \\
-        liblapack-devel \\
-        libopenblas-devel \\
-        libpcap-devel \\
-        libxml2-devel \\
-        libxslt-devel \\
-        make \\
-        mawk \\
-        perl \\
-        perl-XML-XPath \\
-        python3-pip \\
-        rake \\
-        ruby-devel \\
-        sshpass \\
-        sysstat \\
-        sudo \\
-        tree \\
-        unzip \\
-        vim \\
-        wget \\
-        xmlstarlet \\
-        xz \\
-  && curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | bash \\
-  && curl -fsSL https://get.docker.com | sh \\
-  && yum clean all
-
-# Install packages for all project branches
-#
-RUN dbld_vpp_install_packages.sh \\
-  && dbld_csit_install_packages.sh \\
-  && yum clean all
-EOF
-}
-
-generate_yum_dockerfile_clean() {
-    cat <<EOF >>"$DOCKERFILE"
-
-# Clean up
-RUN dbld_dump_build_logs.sh \\
-  && rm -rf "/tmp/*" "/root/.ccache"
-EOF
-}
-
-builder_generate_yum_dockerfile() {
-    local executor_class="$1"
-    local executor_os_name="$2"
-    local from_image="$3"
-    local executor_image="$4"
-
-    generate_yum_dockerfile_common "$executor_class" "$executor_image"
-    cat <<EOF >>"$DOCKERFILE"
-
-# Install LF-IT requirements
-ENV LF_VENV="/root/lf-venv"
-RUN dbld_lfit_requirements.sh \\
-  && yum clean all
-
-# Install packagecloud requirements
-RUN gem install package_cloud \\
-  && curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | bash
-
-# CI Runtime Environment
-WORKDIR /
-ENV VPP_ZOMBIE_NOCHECK="1"
-ENV CCACHE_DIR="/scratch/ccache"
-ENV CCACHE_MAXSIZE="10G"
-EOF
-    generate_yum_dockerfile_clean
-}
-
-csit_generate_yum_dockerfile() {
-    echo_log "ERROR: ${FUNCNAME[0]} TBD!"
-    exit 1
-}
-
-csit_dut_generate_yum_dockerfile() {
-    echo_log "ERROR: ${FUNCNAME[0]} TBD!"
-    exit 1
-}
-
-csit_shim_generate_yum_dockerfile() {
-    echo_log "ERROR: ${FUNCNAME[0]} TBD!"
-    exit 1
-}
-
-generate_yum_dockerfile() {
-    local executor_class="$1"
-    local executor_os_name="$2"
-    local from_image="$3"
-    local executor_image="$4"
-
-    cat <<EOF  >"$DOCKERIGNOREFILE"
-**/__pycache__
-*.pyc
-EOF
-    cat <<EOF  >"$DOCKERFILE"
-FROM $from_image AS ${executor_class}-executor-image
-LABEL Description="FD.io CI '$executor_class' executor docker image for $executor_os_name/$OS_ARCH"
-LABEL Vendor="fd.io"
-LABEL Version="$DOCKER_TAG"
-EOF
-    ${executor_class}_generate_yum_dockerfile "$executor_class" \
-        "$executor_os_name" "$from_image" "$executor_image"
-}