The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/59
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 28b36ac3a412f6d9254f0b0dafb7f40327eb1846 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 13 Aug 2019 16:35:46 +0200
Subject: [PATCH 1/2] images: Add cloud-init for remaining images
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/alpine.yaml | 26 ++++++++++++++++++++++++++
images/debian.yaml | 26 ++++++++++++++++++++++++++
images/devuan.yaml | 26 ++++++++++++++++++++++++++
images/kali.yaml | 26 ++++++++++++++++++++++++++
images/opensuse.yaml | 26 ++++++++++++++++++++++++++
5 files changed, 130 insertions(+)
diff --git a/images/alpine.yaml b/images/alpine.yaml
index 0fe5a7f..8e85e2d 100644
--- a/images/alpine.yaml
+++ b/images/alpine.yaml
@@ -245,6 +245,26 @@ files:
# Stuff to do before rebooting
::shutdown:/sbin/openrc shutdown
+ - name: meta-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: network-config
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: user-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: vendor-data
+ generator: cloud-init
+ variants:
+ - cloud
+
packages:
manager: apk
update: true
@@ -255,6 +275,12 @@ packages:
- alpine-base
action: install
+ - packages:
+ - cloud-init
+ action: install
+ variants:
+ - cloud
+
actions:
- trigger: post-packages
action: |-
diff --git a/images/debian.yaml b/images/debian.yaml
index e5ee5d4..c387a23 100644
--- a/images/debian.yaml
+++ b/images/debian.yaml
@@ -848,6 +848,26 @@ files:
auto eth0
iface eth0 inet dhcp
+ - name: meta-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: network-config
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: user-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: vendor-data
+ generator: cloud-init
+ variants:
+ - cloud
+
packages:
manager: apt
update: true
@@ -865,6 +885,12 @@ packages:
- vim
action: install
+ - packages:
+ - cloud-init
+ action: install
+ variants:
+ - cloud
+
actions:
- trigger: post-packages
action: |-
diff --git a/images/devuan.yaml b/images/devuan.yaml
index ae0fc43..f211ecf 100644
--- a/images/devuan.yaml
+++ b/images/devuan.yaml
@@ -284,6 +284,26 @@ files:
APT::AutoRemove::SuggestsImportant "false";
APT::AutoRemove::RecommendsImportant "false";
+ - name: meta-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: network-config
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: user-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: vendor-data
+ generator: cloud-init
+ variants:
+ - cloud
+
packages:
manager: apt
update: true
@@ -312,6 +332,12 @@ packages:
- wget
action: install
+ - packages:
+ - cloud-init
+ action: install
+ variants:
+ - cloud
+
actions:
- trigger: post-packages
action: |-
diff --git a/images/kali.yaml b/images/kali.yaml
index d49094e..632f841 100644
--- a/images/kali.yaml
+++ b/images/kali.yaml
@@ -1693,6 +1693,26 @@ files:
auto eth0
iface eth0 inet dhcp
+ - name: meta-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: network-config
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: user-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: vendor-data
+ generator: cloud-init
+ variants:
+ - cloud
+
packages:
manager: apt
update: true
@@ -1711,6 +1731,12 @@ packages:
- systemd
action: install
+ - packages:
+ - cloud-init
+ action: install
+ variants:
+ - cloud
+
actions:
- trigger: post-packages
action: |-
diff --git a/images/opensuse.yaml b/images/opensuse.yaml
index 8337dab..91069c6 100644
--- a/images/opensuse.yaml
+++ b/images/opensuse.yaml
@@ -71,6 +71,26 @@ files:
STARTMODE='auto'
BOOTPROTO='dhcp'
+ - name: meta-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: network-config
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: user-data
+ generator: cloud-init
+ variants:
+ - cloud
+
+ - name: vendor-data
+ generator: cloud-init
+ variants:
+ - cloud
+
packages:
manager: zypper
update: true
@@ -103,3 +123,9 @@ packages:
- "15.0"
- "tumbleweed"
action: install
+
+ - packages:
+ - cloud-init
+ action: install
+ variants:
+ - cloud
From c993395ed2174706242e25335a52cad28a6543e7 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 13 Aug 2019 16:38:31 +0200
Subject: [PATCH 2/2] jenkins/jobs: Add remaining cloud-init images
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
jenkins/jobs/image-alpine.yaml | 1 +
jenkins/jobs/image-debian.yaml | 1 +
jenkins/jobs/image-devuan.yaml | 1 +
jenkins/jobs/image-kali.yaml | 1 +
jenkins/jobs/image-opensuse.yaml | 1 +
5 files changed, 5 insertions(+)
diff --git a/jenkins/jobs/image-alpine.yaml b/jenkins/jobs/image-alpine.yaml
index 207cf42..6c5cf3a 100644
--- a/jenkins/jobs/image-alpine.yaml
+++ b/jenkins/jobs/image-alpine.yaml
@@ -32,6 +32,7 @@
type: user-defined
values:
- default
+ - cloud
- axis:
name: restrict
diff --git a/jenkins/jobs/image-debian.yaml b/jenkins/jobs/image-debian.yaml
index 8fe4d11..db93de2 100644
--- a/jenkins/jobs/image-debian.yaml
+++ b/jenkins/jobs/image-debian.yaml
@@ -32,6 +32,7 @@
type: user-defined
values:
- default
+ - cloud
- axis:
name: restrict
diff --git a/jenkins/jobs/image-devuan.yaml b/jenkins/jobs/image-devuan.yaml
index ac799ad..96af11d 100644
--- a/jenkins/jobs/image-devuan.yaml
+++ b/jenkins/jobs/image-devuan.yaml
@@ -27,6 +27,7 @@
type: user-defined
values:
- default
+ - cloud
- axis:
name: restrict
diff --git a/jenkins/jobs/image-kali.yaml b/jenkins/jobs/image-kali.yaml
index 2cd8314..0ef5002 100644
--- a/jenkins/jobs/image-kali.yaml
+++ b/jenkins/jobs/image-kali.yaml
@@ -27,6 +27,7 @@
type: user-defined
values:
- default
+ - cloud
- axis:
name: restrict
diff --git a/jenkins/jobs/image-opensuse.yaml b/jenkins/jobs/image-opensuse.yaml
index 19e6de1..71dbb2d 100644
--- a/jenkins/jobs/image-opensuse.yaml
+++ b/jenkins/jobs/image-opensuse.yaml
@@ -29,6 +29,7 @@
type: user-defined
values:
- default
+ - cloud
- axis:
name: restrict
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
