The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/91
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 319a32cd64f8e8e8b4156d76b7034c306ae0f336 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 15 Oct 2019 09:14:24 +0200
Subject: [PATCH 1/5] images/debian: Update repo and early packages
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/debian.yaml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/images/debian.yaml b/images/debian.yaml
index c746514..ba57720 100644
--- a/images/debian.yaml
+++ b/images/debian.yaml
@@ -782,9 +782,6 @@ source:
-----END PGP PUBLIC KEY BLOCK-----
variant: minbase
- apt_sources: |-
- deb http://deb.debian.org/debian {{ image.release }} main
- {% if image.release != "sid" and image.release != "bullseye" and not
(image.release == "wheezy" and image.architecture_mapped == "powerpc") and not
(image.release == "wheezy" and image.architecture_mapped == "s390x") %}deb
http://security.debian.org/debian-security {{ image.release }}/updates main{%
endif %}
targets:
lxc:
@@ -895,6 +892,12 @@ packages:
variants:
- cloud
+ repositories:
+ - name: sources.list
+ url: |-
+ deb http://deb.debian.org/debian {{ image.release }} main
+ {% if image.release != "sid" and image.release != "bullseye" and not
(image.release == "wheezy" and image.architecture_mapped == "powerpc") and not
(image.release == "wheezy" and image.architecture_mapped == "s390x") %}deb
http://security.debian.org/debian-security {{ image.release }}/updates main{%
endif %}
+
actions:
- trigger: post-packages
action: |-
From 44920889d87126705b6d96b54fc2ea7a87f480bd Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 15 Oct 2019 09:14:34 +0200
Subject: [PATCH 2/5] images/devuan: Update repo and early packages
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/devuan.yaml | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/images/devuan.yaml b/images/devuan.yaml
index c6b8526..9084418 100644
--- a/images/devuan.yaml
+++ b/images/devuan.yaml
@@ -208,11 +208,6 @@ source:
-----END PGP PUBLIC KEY BLOCK-----
variant: minbase
- apt_sources: |-
- deb http://deb.devuan.org/merged {{ image.release }} main
- deb http://deb.devuan.org/merged {{ image.release }}-security main
- early_packages:
- - devuan-keyring
targets:
lxc:
@@ -310,6 +305,11 @@ packages:
cleanup: true
sets:
+ - packages:
+ - devuan-keyring
+ action: install
+ early: true
+
- packages:
- ca-certificates
- curl
@@ -338,6 +338,12 @@ packages:
variants:
- cloud
+ repositories:
+ - name: sources.list
+ url: |-
+ deb http://deb.devuan.org/merged {{ image.release }} main
+ deb http://deb.devuan.org/merged {{ image.release }}-security main
+
actions:
- trigger: post-packages
action: |-
From 7dda9d48da1fb160199bfd47e38a8bd52cdfab21 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 15 Oct 2019 09:15:00 +0200
Subject: [PATCH 3/5] images/kali: Update repo and early packages
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/kali.yaml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/images/kali.yaml b/images/kali.yaml
index 7a59159..1955bfd 100644
--- a/images/kali.yaml
+++ b/images/kali.yaml
@@ -1631,10 +1631,6 @@ source:
-----END PGP PUBLIC KEY BLOCK-----
variant: minbase
- apt_sources: |-
- deb http://http.kali.org/kali {{ image.release }} main non-free contrib
- early_packages:
- - kali-archive-keyring
targets:
lxc:
@@ -1721,6 +1717,11 @@ packages:
cleanup: true
sets:
+ - packages:
+ - kali-archive-keyring
+ action: install
+ early: true
+
- packages:
- dialog
- ifupdown
@@ -1741,6 +1742,11 @@ packages:
variants:
- cloud
+ repositories:
+ - name: sources.list
+ url: |-
+ deb http://http.kali.org/kali {{ image.release }} main non-free contrib
+
actions:
- trigger: post-packages
action: |-
From adce61c57ee7e07a227dbc9de11db2283d9b5eb5 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 15 Oct 2019 09:15:17 +0200
Subject: [PATCH 4/5] images/mint: Update repo and early packages
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/mint.yaml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/images/mint.yaml b/images/mint.yaml
index e7fb452..072e4f4 100644
--- a/images/mint.yaml
+++ b/images/mint.yaml
@@ -234,15 +234,6 @@ source:
=384X
-----END PGP PUBLIC KEY BLOCK-----
- apt_sources: |-
- deb http://packages.linuxmint.com {{ image.release }} main upstream import
backport
- deb http://archive.ubuntu.com/ubuntu {{ source.suite }} main restricted
universe multiverse
- deb http://archive.ubuntu.com/ubuntu {{ source.suite }}-updates main
restricted universe multiverse
- deb http://security.ubuntu.com/ubuntu {{ source.suite }}-security main
restricted universe multiverse
-
- early_packages:
- - gnupg
-
targets:
lxc:
create-message: |-
@@ -360,6 +351,11 @@ packages:
cleanup: true
sets:
+ - packages:
+ - gnupg
+ action: install
+ early: true
+
- packages:
- apt-transport-https
- fuse
@@ -374,6 +370,14 @@ packages:
variants:
- cloud
+ repositories:
+ - name: sources.list
+ url: |-
+ deb http://packages.linuxmint.com {{ image.release }} main upstream
import backport
+ deb http://archive.ubuntu.com/ubuntu {{ source.suite }} main
restricted universe multiverse
+ deb http://archive.ubuntu.com/ubuntu {{ source.suite }}-updates main
restricted universe multiverse
+ deb http://security.ubuntu.com/ubuntu {{ source.suite }}-security main
restricted universe multiverse
+
actions:
- trigger: post-unpack
action: |-
From 58412325f65a83fc9788bb9123be7d929e19f9dd Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 15 Oct 2019 09:15:45 +0200
Subject: [PATCH 5/5] images/ubuntu: Update repo and early packages
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/ubuntu.yaml | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml
index e8effea..fdfb194 100644
--- a/images/ubuntu.yaml
+++ b/images/ubuntu.yaml
@@ -234,14 +234,7 @@ source:
=384X
-----END PGP PUBLIC KEY BLOCK-----
- apt_sources: |-
- {% if image.architecture_mapped == "amd64" or image.architecture_mapped ==
"i386" %}deb http://archive.ubuntu.com/ubuntu {{ image.release }} main
restricted universe multiverse
- deb http://archive.ubuntu.com/ubuntu {{ image.release }}-updates main
restricted universe multiverse
- deb http://security.ubuntu.com/ubuntu {{ image.release }}-security main
restricted universe multiverse
- {% else %}deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}
main restricted universe multiverse
- deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-updates main
restricted universe multiverse
- deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-security main
restricted universe multiverse
- {% endif %}
+
targets:
lxc:
@@ -378,6 +371,28 @@ packages:
variants:
- cloud
+ repositories:
+ - name: sources.list
+ url: |-
+ deb http://archive.ubuntu.com/ubuntu {{ image.release }} main
restricted universe multiverse
+ deb http://archive.ubuntu.com/ubuntu {{ image.release }}-updates main
restricted universe multiverse
+ deb http://security.ubuntu.com/ubuntu {{ image.release }}-security
main restricted universe multiverse
+ architectures:
+ - amd64
+ - i386
+
+ - name: sources.list
+ url: |-
+ deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }} main
restricted universe multiverse
+ deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-updates
main restricted universe multiverse
+ deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-security
main restricted universe multiverse
+ architectures:
+ - armhf
+ - arm64
+ - powerpc
+ - powerpc64
+ - ppc64el
+
actions:
- trigger: post-update
action: |-
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
