From 9c1c24fbbc9ed8ad13e3a590e4d2242bf1cffd5e Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 11 Feb 2021 16:44:59 -0500 Subject: Use Ubuntu-20.04 for vpp-csit-* job executor images - refactor vpp-csit job names to conform to the vpp job nomenclature - add ubuntu-20.04 for CSIT image builder install requirements - fix executor class verification - add option to build_executor_docker_image.sh to dump Dockerfile without building image(s) - refactor Dockerfile generation to support executor classes - add support for csit_shim and csit_dut docker image generation from csit ansible repo - refactor docker installation - refactor locale support - remove old static csit Dockerfiles - remove unused jenkins labels - use csit-builder-{os}-prod-{executor_arch} label for vpp csit device test - run tox in csit_pip_cache() to include pylint requirements in python cache to avoid downloading from pypi during job execution. Change-Id: I5f4ffc587c6b8c43cb874dfd8c615ce56d3b97a4 Signed-off-by: Dave Wallace --- jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml | 13 ------------- jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml | 13 ------------- jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml | 5 ----- jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml | 4 ---- .../clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml | 11 ----------- jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml | 13 ------------- .../clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml | 13 ------------- 7 files changed, 72 deletions(-) delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml (limited to 'jenkins-config') diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml deleted file mode 100644 index 747f61ad9..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 20000 - image: "snergster/vpp-ubuntu18" - labels: "ubuntu1804-l" - memory: 32000 - prefix: "prod-amd" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml deleted file mode 100644 index b40b58e63..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "snergster/vpp-ubuntu18" - labels: "ubuntu1804-us" - memory: 14000 - prefix: "prod-amd" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml deleted file mode 100644 index 5f3afcc05..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml +++ /dev/null @@ -1,5 +0,0 @@ -templates: - - image: "snergster/vpp-arm-ubuntu18" - labels: "ubuntu1804arm-s" - memory: 16000 - prefix: "prod-arm" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml deleted file mode 100644 index f898934a6..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml +++ /dev/null @@ -1,4 +0,0 @@ -templates: - - image: "snergster/vpp-arm-ubuntu18" - labels: "ubuntu1804arm-us" - prefix: "prod-arm" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml deleted file mode 100644 index 9ab4631a4..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml +++ /dev/null @@ -1,11 +0,0 @@ -templates: - - constraints: - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csitarm" - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - image: "snergster/vpp-arm-ubuntu18" - labels: "vpp-csit-arm-ubuntu18" - prefix: "prod-csit-arm" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml deleted file mode 100644 index ef4f9eda7..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csit" - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - cpu: 10000 - image: "snergster/vpp-ubuntu18" - labels: "vpp-csit-device vpp-csit-ubuntu18" - memory: 18000 - prefix: "prod-csit" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml deleted file mode 100644 index ef4f9eda7..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csit" - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - cpu: 10000 - image: "snergster/vpp-ubuntu18" - labels: "vpp-csit-device vpp-csit-ubuntu18" - memory: 18000 - prefix: "prod-csit" -- cgit 1.2.3-korg