diff options
| -rw-r--r-- | docker/scripts/lib_apt.sh | 14 | ||||
| -rw-r--r-- | docker/scripts/lib_csit.sh | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index af9da0b6..a2e5c98a 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -54,7 +54,8 @@ apt_override_cmake_install_with_pip3_version() { generate_apt_dockerfile_common() { local executor_class="$1" local executor_image="$2" - + debian_docker_inst_sed="| sed -e 's/has_rootless_extras="1"//g' | sh +" cat <<EOF >>"$DOCKERFILE" # Create download dir to cache external tarballs @@ -194,7 +195,16 @@ 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 \\ - && curl -fsSL https://get.docker.com | sh \\ +EOF + # Hack to prevent failure on debian-9 build + head $DOCKERFILE + if grep -qe 'debian:9' "$DOCKERFILE" ; then + echo " && curl -fsSL https://get.docker.com | sed -e 's/has_rootless_extras=\"1\"//g' | sh \ " >>"$DOCKERFILE" + else + echo " && curl -fsSL https://get.docker.com | sh \ " >>"$DOCKERFILE" + fi + + cat <<EOF >>"$DOCKERFILE" && rm -r /var/lib/apt/lists/* # Install packages for all project branches diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh index b0133ec3..221c1edb 100644 --- a/docker/scripts/lib_csit.sh +++ b/docker/scripts/lib_csit.sh @@ -62,7 +62,7 @@ csit_install_packages() { local branch="$1" local branchname="$(echo $branch | sed -e 's,/,_,')" local csit_dir="$DOCKER_CSIT_DIR" - local csit_ansible_dir="$csit_dir/resources/tools/testbed-setup/ansible" + local csit_ansible_dir="$csit_dir/fdio.infra.ansible" local bld_log="$DOCKER_BUILD_LOG_DIR/$FDIOTOOLS_IMAGENAME" bld_log="${bld_log}-$branchname-csit_install_packages-bld.log" |