# Install OS packages
make_vpp "install-dep" "$branch"
make_vpp "centos-pyyaml" "$branch" # VPP Makefile tests for centos versions
- if [ "$OS_ID" = "ubuntu" ] ; then
- # 'Make docs jobs are only run on ubuntu executors
+ if [ "$OS_ID" = "ubuntu" ] && [ "$OS_ARCH" = "x86_64" ] ; then
+ # 'Make docs jobs are only run on ubuntu x86_64 executors
# so only run for ubuntu build executors.
make_vpp "docs-venv" "$branch"
elif [ "$OS_NAME" = "debian-9" ] ; then
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
-"
+ local dpkg_arch="$(dpkg --print-architecture)"
+
cat <<EOF >>"$DOCKERFILE"
# Create download dir to cache external tarballs
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
# Docker installation script fails on debian-9, so don't install docker
head $DOCKERFILE
cat <<EOF >>"$DOCKERFILE"
&& rm -r /var/lib/apt/lists/*
+# Install terraform for CSIT
+#
+RUN wget https://releases.hashicorp.com/terraform/1.0.4/terraform_1.0.4_linux_$dpkg_arch.zip \\
+ && unzip terraform_1.0.4_linux_$dpkg_arch.zip \\
+ && mv terraform /usr/bin \\
+ && rm -f terraform_1.0.4_linux_$dpkg_arch.zip
+
# Install packages for all project branches
#
RUN apt-get update -qq \\