turnip

Merge ~vila/turnip/+git/jenkaas:master into turnip:master

  1. Git
  2. lp:~vila/turnip/+git/jenkaas
  3. master
  4. Merge into master
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Colin Watson
Approved revision: f01efaaeac4085cc2d9a0552886b13dfdfdc8d3f
Merged at revision: 30c768db7d95091527377f6a1d52afc0df0263d4
Proposed branch: ~vila/turnip/+git/jenkaas:master
Merge into: turnip:master
Diff against target: 13 lines (+0/-5)
1 file modified
ols-vms.conf (+0/-5)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+316926@code.launchpad.net

Commit message

Simplify ols-vms.conf to align with recent versions of ols-jenkaas.

Description of the change

Simplify ols-vms.conf to align with recent versions of ols-jenkaas.

Also intended to validate a new version of ols jenkaas lander.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/turnip-new/3/

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/turnip-new/4/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ols-vms.conf b/ols-vms.conf
2index ac0d188..33ab0b3 100644
3--- a/ols-vms.conf
4+++ b/ols-vms.conf
5@@ -9,8 +9,3 @@ vm.packages = @system-dependencies.txt
6 [turnip]
7 vm.class = lxd
8 vm.update = True
9-vm.poweroff = True
10-
11-[turnip-worker]
12-vm.class = ephemeral-lxd
13-vm.backing = turnip

Subscribers

People subscribed via source and target branches