Skip to content

Commit

Permalink
fix(gce): Hardcode recently unpublished 14.04 source image. This is a…
Browse files Browse the repository at this point in the history
… backport of #471
  • Loading branch information
Travis Tomsu committed Dec 3, 2019
1 parent f01311c commit 1aafcb0
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 8 deletions.
17 changes: 13 additions & 4 deletions halconfig/images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,13 @@ google:
baseImages:
- baseImage:
id: trusty
shortDescription: v14.04
detailedDescription: Ubuntu Trusty Tahr v14.04
shortDescription: v14.04 - Deprecated
detailedDescription: Ubuntu Trusty Tahr v14.04 - Deprecated.
packageType: deb
isImageFamily: true
isImageFamily: false
virtualizationSettings:
sourceImageFamily: ubuntu-1404-lts
# Last published release of Trusty. Has been removed for 1.18 and above.
sourceImage: ubuntu-1404-trusty-v20191107
- baseImage:
id: xenial
shortDescription: v16.04
Expand All @@ -214,3 +215,11 @@ google:
isImageFamily: true
virtualizationSettings:
sourceImageFamily: ubuntu-1604-lts
- baseImage:
id: bionic
shortDescription: v18.04
detailedDescription: Ubuntu Bionic Beaver v18.04
packageType: deb
isImageFamily: true
virtualizationSettings:
sourceImageFamily: ubuntu-1804-lts
17 changes: 13 additions & 4 deletions rosco-web/config/rosco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,13 @@ google:
# sourceImage: ubuntu-1404-trusty-v20170517
- baseImage:
id: trusty
shortDescription: v14.04
detailedDescription: Ubuntu Trusty Tahr v14.04
shortDescription: v14.04 - Deprecated
detailedDescription: Ubuntu Trusty Tahr v14.04 - Deprecated.
packageType: deb
isImageFamily: true
isImageFamily: false
virtualizationSettings:
sourceImageFamily: ubuntu-1404-lts
# Last published release of Trusty. Has been removed for 1.18 and above.
sourceImage: ubuntu-1404-trusty-v20191107
- baseImage:
id: xenial
shortDescription: v16.04
Expand All @@ -360,6 +361,14 @@ google:
isImageFamily: true
virtualizationSettings:
sourceImageFamily: ubuntu-1604-lts
- baseImage:
id: bionic
shortDescription: v18.04
detailedDescription: Ubuntu Bionic Beaver v18.04
packageType: deb
isImageFamily: true
virtualizationSettings:
sourceImageFamily: ubuntu-1804-lts

swagger:
enabled: true
Expand Down

0 comments on commit 1aafcb0

Please sign in to comment.