diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2021-02-11 16:44:59 -0500 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2021-03-20 19:29:27 -0400 |
commit | 9c1c24fbbc9ed8ad13e3a590e4d2242bf1cffd5e (patch) | |
tree | c3b9920e39b9a7d36f5943e5a21382cdb1d5743e /docker/scripts/dbld_install_docker.sh | |
parent | f33265869f283ba931b6662c7605491706f07226 (diff) |
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 <dwallacelf@gmail.com>
Diffstat (limited to 'docker/scripts/dbld_install_docker.sh')
-rwxr-xr-x | docker/scripts/dbld_install_docker.sh | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/docker/scripts/dbld_install_docker.sh b/docker/scripts/dbld_install_docker.sh deleted file mode 100755 index de102835a..000000000 --- a/docker/scripts/dbld_install_docker.sh +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/bash - -# Copyright (c) 2020 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. - -set -euxo pipefail - -export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"} -. $CIMAN_DOCKER_SCRIPTS/lib_apt.sh -. $CIMAN_DOCKER_SCRIPTS/lib_yum.sh -. $CIMAN_DOCKER_SCRIPTS/lib_dnf.sh - -must_be_run_as_root -must_be_run_in_docker_build - -echo_log -echo_log "Starting $(basename $0)" - -case "$DOCKERFILE_FROM" in - *ubuntu*) - write_apt_ubuntu_docker_gpg_keyfile - apt_install_docker_os_package_dependancies - apt_install_docker $DOCKER_APT_UBUNTU_DOCKER_GPGFILE ;; - *debian*) - write_apt_debian_docker_gpg_keyfile - apt_install_docker_os_package_dependancies - apt_install_docker $DOCKER_APT_DEBIAN_DOCKER_GPGFILE ;; - *centos:7) - yum_install_docker_os_package_dependancies - yum_install_docker ;; - *centos:8) - dnf_install_docker_os_package_dependancies - dnf_install_docker ;; -esac - -echo_log -e "Completed $(basename $0)!\n\n==========" |