diff --git a/.circleci/config.yml b/.circleci/config.yml index c503fce7b6f..7c600c2e05b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -486,7 +486,7 @@ jobs: if [ -z "${BUILD_ONLY}" ]; then # Note [Special build images] # The xla build uses the same docker image as - # pytorch-linux-trusty-py3.6-gcc5.4-build. In the push step, we have to + # pytorch_linux_bionic_py3_6_clang9_build. In the push step, we have to # distinguish between them so the test can pick up the correct image. output_image=${DOCKER_IMAGE}:${DOCKER_TAG}-${CIRCLE_SHA1} if [[ ${BUILD_ENVIRONMENT} == *"xla"* ]]; then diff --git a/.circleci/docker/build.sh b/.circleci/docker/build.sh index 0afc1b33c59..98f84188d31 100755 --- a/.circleci/docker/build.sh +++ b/.circleci/docker/build.sh @@ -40,9 +40,7 @@ function extract_all_from_image_name() { done } -if [[ "$image" == *-trusty* ]]; then - UBUNTU_VERSION=14.04 -elif [[ "$image" == *-xenial* ]]; then +if [[ "$image" == *-xenial* ]]; then UBUNTU_VERSION=16.04 elif [[ "$image" == *-artful* ]]; then UBUNTU_VERSION=17.10 diff --git a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml index 3a1bcdd31cf..c10236808ba 100644 --- a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml +++ b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml @@ -52,7 +52,7 @@ jobs: if [ -z "${BUILD_ONLY}" ]; then # Note [Special build images] # The xla build uses the same docker image as - # pytorch-linux-trusty-py3.6-gcc5.4-build. In the push step, we have to + # pytorch_linux_bionic_py3_6_clang9_build. In the push step, we have to # distinguish between them so the test can pick up the correct image. output_image=${DOCKER_IMAGE}:${DOCKER_TAG}-${CIRCLE_SHA1} if [[ ${BUILD_ENVIRONMENT} == *"xla"* ]]; then diff --git a/.jenkins/pytorch/build.sh b/.jenkins/pytorch/build.sh index 2e14b823b36..3e197d867b6 100755 --- a/.jenkins/pytorch/build.sh +++ b/.jenkins/pytorch/build.sh @@ -16,20 +16,6 @@ fi source "$(dirname "${BASH_SOURCE[0]}")/common.sh" -# For distributed, four environmental configs: -# (1) build with only NCCL -# (2) build with NCCL and MPI -# (3) build with only MPI -# (4) build with neither -if [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda9*gcc7* ]] || [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda9*gcc5* ]] || [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda10.1-* ]] || [[ "$BUILD_ENVIRONMENT" == *-trusty-py2.7.9* ]]; then - if [[ "$BUILD_ENVIRONMENT" == *-trusty-py2.7.9* ]]; then - # TODO: move this to Docker - sudo apt-get -qq update - sudo apt-get -qq install openmpi-bin libopenmpi-dev - fi - sudo mkdir -p /var/run/sshd -fi - if [[ "$BUILD_ENVIRONMENT" == *-linux-xenial-py3-clang5-asan* ]]; then exec "$(dirname "${BASH_SOURCE[0]}")/build-asan.sh" "$@" fi