diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2022-02-07 13:54:42 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2022-03-15 15:13:56 +0000 |
| commit | 9813d88cb17cc57ac6fe3fad0b8ff7a17bfd419f (patch) | |
| tree | 3988bf569334938e12c40031b96ae2a1b76a2649 | |
| parent | 45b1144b4fbbbd0f3c95e82d43ba97b73aa22b2c (diff) | |
docker builder: add debian-11 executor image.
= Add vpp-*-master-debian11-x86_64 jobs
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I1bb12d72e28ef8a9872558fb4f6def6b520981ae
| -rw-r--r-- | docker/scripts/lib_apt.sh | 7 | ||||
| -rw-r--r-- | docker/scripts/lib_common.sh | 2 | ||||
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 1 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 8 |
4 files changed, 12 insertions, 6 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index d9543fd77..f9b49373d 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -96,9 +96,8 @@ ENV LANG="en_US.UTF-8" LANGUAGE="en_US" LC_ALL="en_US.UTF-8" # build-essential # # TODO: Fix broken project requirement install targets -# graphviz for 'make bootstrap-doxygen' (VPP) -# doxygen for 'make doxygen' (VPP) -# enchant for 'make docs' (VPP) +# graphviz for doxygen (HICN) +# doxygen for doxygen (HICN) # libffi-dev for python cffi install (Ubuntu20.04/VPP/aarch64) # liblapack-dev for python numpy/scipy (CSIT/aarch64) # libopenblas-dev for python numpy/scipy (CSIT/aarch64) @@ -130,7 +129,6 @@ RUN apt-get update -qq \\ default-jre \\ dnsutils \\ doxygen \\ - enchant \\ emacs \\ facter \\ gawk \\ @@ -180,7 +178,6 @@ RUN apt-get update -qq \\ zlib1g-dev \\ && curl -L https://packagecloud.io/fdio/master/gpgkey | apt-key add - \\ && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | bash \\ - EOF cat <<EOF >>"$DOCKERFILE" diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh index 57169d842..f48ba8dba 100644 --- 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"]="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["builder-x86_64"]="debian-10 debian-11 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_vpp.sh b/docker/scripts/lib_vpp.sh index 71cb5fb84..ae1a43240 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -100,6 +100,7 @@ docker_build_setup_vpp() { # definitions here. declare -A VPP_BRANCHES VPP_BRANCHES["debian-10"]="stable/2110 stable/2202 master" +VPP_BRANCHES["debian-11"]="master" VPP_BRANCHES["ubuntu-18.04"]="stable/2110" VPP_BRANCHES["ubuntu-20.04"]="stable/2110 stable/2202 master" export VPP_BRANCHES diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 059d1e34a..122c5a3ff 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -76,6 +76,7 @@ branch-refspec: '' os: - debian10 + - debian11 - ubuntu1804 - ubuntu2004 executor-arch: 'x86_64' @@ -86,6 +87,13 @@ # OS deprecated on 2202 - stream: '2202' os: 'ubuntu1804' + # os added in master + - stream: '2106' + os: 'debian11' + - stream: '2110' + os: 'debian11' + - stream: '2202' + os: 'debian11' # [end] VPP-X86_64 PROJECT # VPP-DEBUG-X86_64 PROJECT |