Commit c9521334 authored by Nate Childers's avatar Nate Childers 🚴

Merge branch 'nbc9-add-ubuntu20' into 'development'

add ubuntu20

See merge request !26
parents 916b8f67 1a162aac
Pipeline #145560 passed with stages
in 11 minutes and 26 seconds
......@@ -51,6 +51,10 @@ variables:
variables: &variables-ubuntu-1804
BUILD_OS: "ubuntu-18.04"
.variables-ubuntu-20.04:
variables: &variables-ubuntu-2004
BUILD_OS: "ubuntu-20.04"
stages:
- build preseed
- build vm
......@@ -135,6 +139,16 @@ build development ubuntu-18.04:
<<: *variables-ubuntu-1804
<<: *variables-development
build development ubuntu-20.04:
extends: .build-generic
environment:
name: development
except:
- master
variables:
<<: *variables-ubuntu-2004
<<: *variables-development
# basic deployer job
# creates a content library item from a vm built by the builder
......@@ -194,6 +208,17 @@ deploy development ubuntu-18.04:
dependencies:
- build development ubuntu-18.04
deploy development ubuntu-20.04:
extends: .deploy-generic
environment:
name: development
except:
- master
variables:
<<: *variables-ubuntu-2004
<<: *variables-development
dependencies:
- build development ubuntu-20.04
# basic prod deployer job
# copies a template to the FINAL_TEMPLATE_NAME
# which is what is referenced by the OS in Clockworks.
......@@ -247,3 +272,14 @@ deploy development template ubuntu-18.04:
variables:
<<: *variables-ubuntu-1804
<<: *variables-development
deploy development template ubuntu-20.04:
extends: .deploy-template
environment:
name: development
when: on_success
except:
- master
variables:
<<: *variables-ubuntu-2004
<<: *variables-development
\ No newline at end of file
Subproject commit 68e0dcfd353c87870928294db509d6f08eb96e1b
Subproject commit 5401ce0d58157a327fc9fc26f55f637b15f6b521
{
"template-os-version": "ubuntu-20.04-server-amd64",
"installer-iso": "ubuntu-20.04-legacy-server-amd64.iso",
"installer-iso-url": "http://cdimage.ubuntu.com/ubuntu-legacy-server/releases/20.04/release/ubuntu-20.04-legacy-server-amd64.iso",
"installer-iso-sha256": "36f15879bd9dfd061cd588620a164a82972663fdd148cce1f70d57d314c21b73"
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment