diff options
author | Roman Grundkiewicz <rogrundk@microsoft.com> | 2021-09-20 16:14:24 +0300 |
---|---|---|
committer | Roman Grundkiewicz <rogrundk@microsoft.com> | 2021-09-20 16:14:24 +0300 |
commit | aa58ba8e239d228d539734e6be8266fbb3181044 (patch) | |
tree | 05adec607712aabb451311bde4726da8ecba0550 | |
parent | 8470c16bdd92797e75e7d5e7397ef7b29896538a (diff) |
Merged PR 20593: Fix and update Azure pipelines
- Add `--allow-unauthenticated` to `apt` when installing CUDA on Ubuntu
- Removing `ubuntu-16.04` image from Azure pipelines, which will become unavailable after September 20
-rw-r--r-- | azure-pipelines.yml | 26 | ||||
-rwxr-xr-x | scripts/ci/install_cuda_ubuntu.sh | 2 |
2 files changed, 8 insertions, 20 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d4d0b2e5..7953b282 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -246,17 +246,7 @@ stages: examples: true static: true ################################################################ - # Ubuntu 16.04 supports CUDA 8+ - "16.04 CUDA 9.2 gcc-7": - image: ubuntu-16.04 - boost: true - cpu: true - gpu: true - cuda: 9.2 - gcc: 7 - unit_tests: true - examples: true - static: false + # Ubuntu 16.04 is no longer available on Azure-hosted machines pool: vmImage: $(image) @@ -332,18 +322,16 @@ stages: ###################################################################### - job: BuildUbuntuMinimal condition: eq(${{ parameters.runBuilds }}, true) - displayName: Ubuntu CPU+GPU gcc-5 cmake 3.5 + displayName: Ubuntu CPU+GPU gcc-7 cmake 3.5 pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-18.04 steps: - checkout: self submodules: true # The script simplifies installation of different versions of CUDA. - # Ubuntu 16.04 on Azure-hosted VMs have GCC 5.5 as gcc-5, which is not compatible with CUDA 9. - # Downgrading to GCC 5.4 (the default gcc on Ubuntu 16.04) would be more work... - bash: ./scripts/ci/install_cuda_ubuntu.sh "10.0" displayName: Install CUDA @@ -356,10 +344,10 @@ stages: # GCC 5 is the minimum version supported - bash: | - /usr/bin/gcc-5 --version + /usr/bin/gcc-7 --version mkdir -p build cd build - CC=/usr/bin/gcc-5 CXX=/usr/bin/g++-5 CUDAHOSTCXX=/usr/bin/g++-5 \ + CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7 CUDAHOSTCXX=/usr/bin/g++-7 \ ../cmake-3.5.1-Linux-x86_64/bin/cmake .. \ -DCOMPILE_CPU=on \ -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-10.0 @@ -592,7 +580,7 @@ stages: # Avoid using $(Build.SourcesDirectory) in bash tasks because on Windows pools it uses '\' # instead of '/', which often breaks the job - - bash: MARIAN=../marian-dev/build bash ./run_mrt.sh '#cpu' '#basics' + - bash: MARIAN=../marian-dev/build TIMEOUT=10m bash ./run_mrt.sh '#cpu' '#basics' '#devops' continueOnError: true displayName: Run tests workingDirectory: marian-prod-tests @@ -689,7 +677,7 @@ stages: AWS_SECRET_SAS_TOKEN: $(blob-sas-token) workingDirectory: marian-prod-tests - - bash: MARIAN=../marian-dev/build bash ./run_mrt.sh '#cpu' '#basics' + - bash: MARIAN=../marian-dev/build bash ./run_mrt.sh '#cpu' '#basics' '#devops' continueOnError: true displayName: Run tests workingDirectory: marian-prod-tests diff --git a/scripts/ci/install_cuda_ubuntu.sh b/scripts/ci/install_cuda_ubuntu.sh index 8dc77eda..b058294a 100755 --- a/scripts/ci/install_cuda_ubuntu.sh +++ b/scripts/ci/install_cuda_ubuntu.sh @@ -91,7 +91,7 @@ sudo add-apt-repository "deb ${REPO_URL} /" sudo apt-get update echo "Installing CUDA packages ${CUDA_PACKAGES}" -sudo apt-get -y install ${CUDA_PACKAGES} +sudo apt-get -y --allow-unauthenticated install ${CUDA_PACKAGES} if [[ $? -ne 0 ]]; then echo "CUDA Installation Error." |