diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2022-08-12 13:59:03 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2022-09-07 03:10:49 +0000 |
| commit | bb3e6cc4961e8b8aa74d9a7d7cfd34c0bed5f243 (patch) | |
| tree | 881313761e7ee0fdf031a70cb400e4ce7c2b5906 /docker | |
| parent | 5dc49a48571abb31bc65d012dbfaca7b94912489 (diff) | |
Support ubuntu-22.04 docker exector image building & vpp jobs
Change-Id: I71b654cd072288e4ede70285a0740a7f18caa299
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/scripts/lib_common.sh | 12 | ||||
| -rw-r--r-- | docker/scripts/lib_csit.sh | 3 | ||||
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh index 69587f6f..f4eec961 100644 --- a/docker/scripts/lib_common.sh +++ b/docker/scripts/lib_common.sh @@ -156,12 +156,12 @@ 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"]="ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-20.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-x86_64"]="ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-20.04 ubuntu-22.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04 ubuntu-22.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-22.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-22.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-22.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-x86_64"]="ubuntu-22.04" export EXECUTOR_CLASS_ARCH_OS_NAMES executor_list_roles() { diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh index 31afde09..525e7487 100644 --- a/docker/scripts/lib_csit.sh +++ b/docker/scripts/lib_csit.sh @@ -34,7 +34,8 @@ csit_supported_executor_class() { csit_supported_os() { case "$1" in - ubuntu-20.04) return 0 ;; + # TODO: fix to be only ubuntu-22.04 once migration is complete. + ubuntu-2[02].04) return 0 ;; *) ;; esac return 1 diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 5353b63e..8f1b8f10 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -99,4 +99,5 @@ declare -A VPP_BRANCHES VPP_BRANCHES["debian-10"]="stable/2202 stable/2206 master" VPP_BRANCHES["debian-11"]="stable/2206 master" VPP_BRANCHES["ubuntu-20.04"]="stable/2202 stable/2206 master" +VPP_BRANCHES["ubuntu-22.04"]="master" export VPP_BRANCHES |