Skip to content

Commit

Permalink
Consistently use ubuntu-18.04
Browse files Browse the repository at this point in the history
We currently use a mix of 16.04 and 18.04.

Change-Id: I62e64a7cadd2bea08ee35933757d094af9468d03
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
  • Loading branch information
sykesm authored and mastersingh24 committed Mar 29, 2020
1 parent fa29042 commit 8a012a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ci/azure-pipelines-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ variables:
jobs:
- job: UnitTests
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
steps:
- template: install_deps.yml
- checkout: self
Expand Down
6 changes: 3 additions & 3 deletions ci/azure-pipelines-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stages:
jobs:
- job: Build
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
container: golang:$(GOVER)
strategy:
matrix:
Expand All @@ -46,7 +46,7 @@ stages:
jobs:
- job: Docker
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
steps:
- template: install_deps.yml
- checkout: self
Expand All @@ -66,7 +66,7 @@ stages:
jobs:
- job: Release
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
steps:
- download: current
patterns: '*.tar.gz'
Expand Down
2 changes: 1 addition & 1 deletion vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Vagrant.require_version ">= 1.7.4"
Vagrant.configure('2') do |config|
config.vm.box = "bento/ubuntu-16.04"
config.vm.box = "bento/ubuntu-18.04"
config.vm.synced_folder "..", "/home/vagrant/go/src/github.com/hyperledger/fabric"
config.ssh.forward_agent = true

Expand Down

0 comments on commit 8a012a0

Please sign in to comment.